完善

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

@@ -853,8 +853,8 @@ public class RepairApplicationFormServiceImpl extends BaseServiceImpl<RepairAppl
                     for (RepairApplicationFormVO repairApplicationForm : list) {
                         if (repairApplicationForm.getApplyTime().isAfter(map.get("searchStartTime")) && repairApplicationForm.getApplyTime().isBefore(map.get("searchEndTime"))) {
                             if (repairApplicationForm.getCategory() != null && dictVO.getValue().equals(repairApplicationForm.getCategory())) {
-                               num++;
-                               detailList.add(repairApplicationForm);
+                                num++;
+                                detailList.add(repairApplicationForm);
                             }
                         }
                     }
@@ -962,11 +962,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()));
+        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()));
+            }
+        }
         applicationForm.setCategory(dto.getCategory());
         mapper.updateByPrimaryKeySelective(applicationForm);
     }