Merge branch 'feature-dingwf-0715' into develop

project-order/src/main/java/com/dituhui/pea/order/entity/OrgTeamEntity.java

@@ -73,7 +73,17 @@ public class OrgTeamEntity {
      */
     private LocalDateTime updateTime;
 
-    public OrgTeamEntity(){
+    private String workOn;
+    private String workOff;
+    private Integer workDuration;
+    private String transportMode;
+    private String strategySchedule;
+    private String strategyAppointment;
+    private Integer intervalSchedule;
+    private Integer intervalScheduleNext;
+    private String cuteOff;
+
+    public OrgTeamEntity() {
 
     }
 }

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

@@ -45,7 +45,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
         List<BusinessTeamsDTO.Content> contents = new ArrayList<>();
         Pageable pageable = PageRequest.of(req.getPage() - 1, req.getSize());
         Page<OrgTeamEntity> page = null;
-        if ("branch".equals(req.getLevelType())){
+        if ("branch".equals(req.getLevelType())) {
             page = orgTeamDao.findAllByBranchId(req.getLevelValue(), pageable);
         } else {
             page = orgTeamDao.findAllByGroupId(req.getLevelValue(), pageable);
@@ -58,14 +58,15 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
             content.setTeamId(e.getTeamId()).setTeamName(e.getTeamName());
             content.setWorkdays(String.join("、", getWorkdaysChinese(e.getWorkdays())));
             content.setEngineers(String.join(";", engineers));
-            // todo 工作队容量
             OrgWarehouseInfoEntity warehouse = warehouseInfoDao.getByTeamAssigned(e.getTeamId());
-            if (warehouse != null){
+            if (warehouse != null) {
                 content.setWarehouseName(warehouse.getWarehouseName());
             }
-            //capacityUse已占容量， capacityRest剩余容量
-            // ordersNum 当前单数
-            // pepleMinute 人数/分钟数
+            int num = engineers.size();
+            int total = num * e.getWorkDuration();
+            content.setPeopleMinute(String.format("%s/%s", num, total));
+            // 容量
+            // 订单数
             contents.add(content);
         }
         BusinessTeamsDTO.Result rs = new BusinessTeamsDTO.Result();