Merge branch 'develop-dingwf-0714' into develop

project-order/src/main/java/com/dituhui/pea/order/dto/CapacityStatQueryDTO.java

@@ -52,6 +52,7 @@ public class CapacityStatQueryDTO {
         private long capAdjust;
         private long capTotal;
         private long capUsed;
+        private long capLeft;
 
         @JsonDeserialize(using = LocalDateTimeDeserializer.class)
         @JsonSerialize(using = LocalDateTimeSerializer.class)

project-order/src/main/java/com/dituhui/pea/order/service/impl/OrgCapacityServiceImpl.java

@@ -77,18 +77,28 @@ public class OrgCapacityServiceImpl implements OrgCapacityService {
                 CapacityOrgStatEntity e = (CapacityOrgStatEntity) item;
                 content.setLevelType(e.getType()).setLevelValue(e.getOrgId());
                 content.setShowName(names.get(e.getOrgId()));
-                content.setDate(e.getWorkday()).setLayer(e.getLayer())
-                        .setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsedTotal())
-                        .setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime());
+                content.setDate(e.getWorkday())
+                        .setLayer(e.getLayer())
+                        .setCapTotal(e.getCapTotal())
+                        .setCapUsed(e.getCapUsedTotal())
+                        .setCapLeft(e.getCapLeft())
+                        .setEngineerNum(e.getEngineerCount())
+                        .setUpdateTime(e.getUpdateTime());
             } else {
                 // group查询，是capacity_team_stat
                 CapacityTeamStatEntity e = (CapacityTeamStatEntity) item;
                 // capacity_team_stat表中的team_id，直接就是字符串
                 content.setLevelType("team").setLevelValue(e.getTeamId());
                 content.setShowName(names.get(e.getTeamId()));
-                content.setDate(e.getWorkday()).setLayer(e.getLayer()).setShowName(e.getTeamId())
-                        .setCapTotal(e.getCapTotal()).setCapUsed(e.getCapUsed()).setCapAdjust(e.getCapAdjust())
-                        .setEngineerNum(e.getEngineerCount()).setUpdateTime(e.getUpdateTime());
+                content.setDate(e.getWorkday())
+                        .setLayer(e.getLayer())
+                        .setShowName(e.getTeamId())
+                        .setCapTotal(e.getCapTotal())
+                        .setCapUsed(e.getCapUsed())
+                        .setCapLeft(e.getCapLeft())
+                        .setCapAdjust(e.getCapAdjust())
+                        .setEngineerNum(e.getEngineerCount())
+                        .setUpdateTime(e.getUpdateTime());
             }
             contents.add(content);
         }