Merge branch 'feature-dingwf-0715' into develop

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

@@ -5,6 +5,7 @@ import cn.hutool.core.util.IdUtil;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.order.dao.*;
 import com.dituhui.pea.order.dto.*;
+import com.dituhui.pea.order.entity.OrgGroupEntity;
 import com.dituhui.pea.order.entity.OrgTeamEngineerEntity;
 import com.dituhui.pea.order.entity.OrgTeamEntity;
 import com.dituhui.pea.order.entity.OrgWarehouseInfoEntity;
@@ -42,7 +43,7 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
     private EngineerInfoDao engineerInfoDao;
 
     @Autowired
-    private CapacityTeamStatDao capacityTeamStatDao;
+    private OrgGroupDao orgGroupDao;
 
     @Autowired
     private CommonService commonService;
@@ -107,33 +108,44 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
 
     @Override
     public Result<?> addTeam(BusinessTeamAddDTO.Request req) {
-        OrgTeamEntity entity = orgTeamDao.findByTeamName(req.getTeamName());
-        if (entity != null) {
+        OrgTeamEntity teamEntity = orgTeamDao.findByTeamName(req.getTeamName());
+        if (teamEntity != null) {
             return Result.failed("相同名称的工作队已经存在");
         }
 
         String teamId = getNewTeamId();
+
+        OrgGroupEntity groupEntity = orgGroupDao.getByGroupId(req.getGroupId());
+        if (groupEntity == null) {
+            return Result.failed("参数的分站/网点不存在");
+        }
+
         // team
-        entity = new OrgTeamEntity();
-        entity.setTeamId(teamId)
+        teamEntity = new OrgTeamEntity();
+        teamEntity.setTeamId(teamId)
+                .setGroupId(req.getGroupId())
+                .setBranchId(groupEntity.getBranchId())
+                .setClusterId(groupEntity.getClusterId())
                 .setTeamName(req.getTeamName())
                 .setTeamType(TEAMTYPE_PEA)
-                .setGroupId(req.getGroupId())
-                .setWarehouseId(req.getWarehouseId())
-                .setWorkdays(String.join(",", req.getWorkdays()));
-        orgTeamDao.save(entity);
-
-
-        // 对应的技术员
-        List<OrgTeamEngineerEntity> engineers = req.getEngineerCodes().stream().map(code -> {
-            return new OrgTeamEngineerEntity()
-                    .setTeamId(teamId)
-                    .setEngineerCode(code)
-                    .setStatus(1)
-                    .setCreateTime(LocalDateTime.now())
-                    .setUpdateTime(LocalDateTime.now());
-        }).collect(Collectors.toList());
-        orgTeamEngineerDao.saveAll(engineers);
+                .setWarehouseId(req.getWarehouseId());
+        if (req.getWorkdays() != null) {
+            teamEntity.setWorkdays(String.join(",", req.getWorkdays()));
+        }
+        orgTeamDao.save(teamEntity);
+
+        if (req.getEngineerCodes() != null) {
+            // 对应的技术员
+            List<OrgTeamEngineerEntity> engineers = req.getEngineerCodes().stream().map(code -> {
+                return new OrgTeamEngineerEntity()
+                        .setTeamId(teamId)
+                        .setEngineerCode(code)
+                        .setStatus(1)
+                        .setCreateTime(LocalDateTime.now())
+                        .setUpdateTime(LocalDateTime.now());
+            }).collect(Collectors.toList());
+            orgTeamEngineerDao.saveAll(engineers);
+        }
 
         return Result.success(null);
     }