Merge branch 'feature-dingwf-0715' into develop

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

@@ -282,15 +282,30 @@ public class BusinessTeamServiceImpl implements BusinessTeamService {
         if (entity == null) {
             return Result.failed("工作队信息不存在！");
         }
-        entity.setCuteOff(req.getWorkOff());
-        entity.setIntervalSchedule(Integer.valueOf(req.getTodayScheduleInterval()));
-        entity.setIntervalScheduleNext(Integer.valueOf(req.getNextScheduleInterval()));
-        entity.setStrategyAppointment(req.getAssiginStrategy());
-        entity.setStrategySchedule(req.getScheduleStrategy());
-        entity.setTransportMode(req.getTransportMode());
-        entity.setWorkOn(req.getWorkOn());
-        entity.setWorkOff(req.getWorkOff());
-        entity.setWorkDuration(Math.toIntExact(getDuration(req.getWorkOn(), req.getWorkOff())));
+        if (req.getWorkOff() != null) {
+            entity.setCuteOff(req.getWorkOff());
+        }
+        if (req.getWorkOn() != null) {
+            entity.setWorkOn(req.getWorkOn());
+        }
+        if (entity.getWorkOn() != null && entity.getWorkOff() != null) {
+            entity.setWorkDuration(Math.toIntExact(getDuration(entity.getWorkOn(), entity.getWorkOff())));
+        }
+        if (req.getTodayScheduleInterval() != null) {
+            entity.setIntervalSchedule(Integer.valueOf(req.getTodayScheduleInterval()));
+        }
+        if (req.getNextScheduleInterval() != null) {
+            entity.setIntervalScheduleNext(Integer.valueOf(req.getNextScheduleInterval()));
+        }
+        if (req.getAssiginStrategy() != null) {
+            entity.setStrategyAppointment(req.getAssiginStrategy());
+        }
+        if (req.getScheduleStrategy() != null) {
+            entity.setStrategySchedule(req.getScheduleStrategy());
+        }
+        if (req.getTransportMode() != null) {
+            entity.setTransportMode(req.getTransportMode());
+        }
         orgTeamDao.save(entity);
 
         return Result.success("success");