模板4.0中，午休上下班时间不存在要写00:00

src/main/java/com/wangxiaolu/promotion/controller/activityplanv2/PromPlanCoreController.java

@@ -61,8 +61,10 @@ public class PromPlanCoreController {
         try {
             String[] urlArr = activityPlanVo.getExcelUrl().split("/");
             String fileId = urlArr[urlArr.length - 1];
-            String filePath = "/root/promotion/planv2/" + fileId;
-            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+//todo            String filePath = "/root/promotion/planv2/" + fileId;
+//todo            FileUtils.downloadExcel(activityPlanVo.getExcelUrl(), filePath);
+            //todo
+            String filePath = activityPlanVo.getExcelUrl();
             activityPlanVo.setExcelId(fileId);
             Map<String, Object> map = promPlanCoreService.selfPlanUp(activityPlanVo, filePath);
             return R.success(map);

src/main/java/com/wangxiaolu/promotion/service/activityplanv2/impl/PromPlanCoreServiceImpl.java

@@ -231,15 +231,13 @@ public class PromPlanCoreServiceImpl implements PromPlanCoreService {
                         // 午休时间：上班时间<午休下班时间<午休上班时间<下班时间
                         LocalTime noonOutLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(8).toString());
                         LocalTime noonInLocalTime = DateUtils.parseLocalTimeByEmdtime(row.get(9).toString());
-
-                        if (ObjectUtils.allNotNull(noonOutLocalTime, noonInLocalTime)
-                                && inLocalTime.isBefore(noonOutLocalTime)
-                                && noonOutLocalTime.isBefore(noonInLocalTime)
-                                && noonInLocalTime.isBefore(outLocalTime))
-                        {
+                        if (LocalTime.MIDNIGHT.equals(noonOutLocalTime) && LocalTime.MIDNIGHT.equals(noonInLocalTime)) {
+                            dto.setNoonClockOutTime(null);
+                            dto.setNoonClockInTime(null);
+                        } else if (inLocalTime.isBefore(noonOutLocalTime) && noonOutLocalTime.isBefore(noonInLocalTime) && noonInLocalTime.isBefore(outLocalTime)) {
                             dto.setNoonClockOutTime(LocalDateTime.of(planDate, noonOutLocalTime));
                             dto.setNoonClockInTime(LocalDateTime.of(planDate, noonInLocalTime));
-                        }else if (ObjectUtils.allNotNull(noonOutLocalTime, noonInLocalTime)){
+                        } else {
                             dto.setErrorMsg("时间错误，正确规则：上班时间<午休下班时间<午休上班时间<下班时间；");
                         }
                     }