hfxc226 2 年之前
父节点
当前提交
2c4817cf26

+ 9 - 6
platform-service/src/main/java/com/platform/service/repair/impl/RepairApplicationFormServiceImpl.java

@@ -1236,12 +1236,15 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
         RepairApplicationForm applicationForm = mapper.selectById(dto.getId());
         // 判断时间是否先后顺序
         applicationForm.setCategory(dto.getCategory());
-        applicationForm.setRepairStartTime(dto.getRepairStartTime());
-        applicationForm.setRepairEndTime(dto.getRepairEndTime());
-        applicationForm.setReceiveMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairStartTime()));
-        applicationForm.setRepairMinutes(DateUtils.getDurationHours(dto.getRepairStartTime(), dto.getRepairEndTime()));
-        applicationForm.setDealMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairEndTime()));
-        applicationForm.setCategory(dto.getCategory());
+        if (dto.getRepairStartTime() != null) {
+            applicationForm.setRepairStartTime(dto.getRepairStartTime());
+            applicationForm.setReceiveMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairStartTime()));
+            if (dto.getRepairEndTime() != null) {
+                applicationForm.setRepairEndTime(dto.getRepairEndTime());
+                applicationForm.setRepairMinutes(DateUtils.getDurationHours(dto.getRepairStartTime(), dto.getRepairEndTime()));
+                applicationForm.setDealMinutes(DateUtils.getDurationHours(applicationForm.getApplyTime(), dto.getRepairEndTime()));
+            }
+        }
         mapper.updateByPrimaryKeySelective(applicationForm);
     }