Merge branch 'feature-dingwf-0715' into develop

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

 package com.dituhui.pea.order.dto;
 
+import lombok.experimental.Accessors;
+
 import java.util.List;
 
 public class BusinessTeamDetailDTO {
@@ -10,9 +12,10 @@ public class BusinessTeamDetailDTO {
     }
 
     @lombok.Data
+    @Accessors(chain = true)
     public static class Result {
         private String capacity;
-        private Engineer[] engineers;
+        private List<Engineer> engineers;
         private ScheduleConfig scheduleConfig;
         private String teamId;
         private String teamName;
@@ -25,6 +28,11 @@ public class BusinessTeamDetailDTO {
     public static class Engineer {
         private String engineerCode;
         private String engineerName;
+
+        public Engineer(String engineerCode, String engineerName){
+            this.engineerCode = engineerCode;
+            this.engineerName = engineerName;
+        }
     }
 
 
@@ -32,6 +40,7 @@ public class BusinessTeamDetailDTO {
      * 排班配置
      */
     @lombok.Data
+    @Accessors(chain = true)
     public static class ScheduleConfig {
         /**
          * 网点指派策略

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

@@ -12,7 +12,7 @@ public interface BusinessTeamService {
 
     Result<?> updateTeamBase(BusinessTeamUpdateDTO.Request req);
 
-    Result<?> getTeamDetail(BusinessTeamDetailDTO.Request req);
+    Result<?> getTeamDetail(BusinessTeamDetailDTO.Request req) throws Exception;
 
     Result<?> deleteTeam(BusinessTeamDeleteDTO.Request req);
 

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

@@ -4,6 +4,7 @@ import cn.hutool.core.date.Week;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dao.*;
 import com.dituhui.pea.order.dto.*;
+import com.dituhui.pea.order.entity.OrgTeamEngineerEntity;
 import com.dituhui.pea.order.entity.OrgTeamEntity;
 import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
 import com.dituhui.pea.order.service.BusinessTeamService;
@@ -64,7 +65,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
             }
             int num = engineers.size();
             int total = num * e.getWorkDuration();
-            content.setPeopleMinute(String.format("%s/%s", num, total));
+            content.setPeopleMinute(String.format("%s人/%s分钟", num, total));
             // 容量
             // 订单数
             contents.add(content);
@@ -108,8 +109,33 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     }
 
     @Override
-    public Result<?> getTeamDetail(BusinessTeamDetailDTO.Request req) {
-        return null;
+    public Result<?> getTeamDetail(BusinessTeamDetailDTO.Request req) throws Exception {
+        OrgTeamEntity teamEntity = orgTeamDao.getByTeamId(req.getTeamId());
+        if (teamEntity == null){
+            throw new Exception(String.format("工作队[%s]不存在", req.getTeamId()));
+        }
+        BusinessTeamDetailDTO.Result rs = new BusinessTeamDetailDTO.Result();
+        rs.setTeamId(teamEntity.getTeamId())
+                .setTeamName(teamEntity.getTeamName())
+                .setWarehouseId(teamEntity.getWarehouseId())
+                .setWorkdays(Arrays.asList(teamEntity.getWorkdays().split(",")));
+        List<String> engineerCodes = orgTeamEngineerDao.findAllByTeamId(teamEntity.getTeamId()).stream()
+                .map(OrgTeamEngineerEntity::getEngineerCode).collect(Collectors.toList());
+        List<BusinessTeamDetailDTO.Engineer> engineers = engineerInfoDao.findByEngineerCodeIn(engineerCodes).stream().map(e->{
+            return new BusinessTeamDetailDTO.Engineer(e.getEngineerCode(), e.getName());
+        }).collect(Collectors.toList());
+        rs.setEngineers(engineers);
+        BusinessTeamDetailDTO.ScheduleConfig config = new BusinessTeamDetailDTO.ScheduleConfig();
+        config.setAssiginStrategy(teamEntity.getStrategyAppointment())
+                .setCutoffTime(teamEntity.getCuteOff())
+                .setTransportMode(teamEntity.getTransportMode())
+                .setScheduleStrategy(teamEntity.getStrategySchedule())
+                .setTodayScheduleInterval(teamEntity.getIntervalSchedule().toString())
+                .setNextScheduleInterval(teamEntity.getIntervalScheduleNext().toString())
+                .setWorkOn(teamEntity.getWorkOn())
+                .setWorkOff(teamEntity.getWorkOff());
+        rs.setScheduleConfig(config);
+        return Result.success(rs);
     }
 
     @Override