增加对startTime为Null的校验

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/controller/ReportController.java

@@ -290,12 +290,6 @@ public class ReportController {
                         msg.setError("项目["+curP.getProjectName()+"]已撤销。");
                         return msg;
                     }
-                    //取消对截止时间的校验
-//                    if (curP.getPlanEndDate() != null && curP.getPlanEndDate().isBefore(LocalDate.parse(createDate[i], localDtf))) {
-//                        HttpRespMsg msg = new HttpRespMsg();
-//                        msg.setError("项目["+curP.getProjectName()+"]截止于"+localDtf.format(curP.getPlanEndDate())+"，请修改。");
-//                        return msg;
-//                    }
                 } else {
                     //批量填报（含代填）
                     String[] dateArr = createDate[i].split("@");
@@ -310,11 +304,6 @@ public class ReportController {
                             msg.setError("项目["+curP.getProjectName()+"]已撤销。");
                             return msg;
                         }
-//                        if (curP.getPlanEndDate() != null && curP.getPlanEndDate().isBefore(LocalDate.parse(curDate, localDtf))) {
-//                            HttpRespMsg msg = new HttpRespMsg();
-//                            msg.setError("项目["+curP.getProjectName()+"]截止于"+localDtf.format(curP.getPlanEndDate())+"，请修改。");
-//                            return msg;
-//                        }
                     }
                 }
             }

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/service/impl/ReportServiceImpl.java

@@ -4172,7 +4172,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
         HttpRespMsg msg = new HttpRespMsg();
         List<String> dateList = JSONArray.parseArray(dateStr, String.class);
         //获取已经填报的工时
-        List<Report> list = reportMapper.selectList(new QueryWrapper<Report>().select("sum(working_time) as working_time, create_date")
+        List<Report> list = reportMapper.selectList(new QueryWrapper<Report>().select("sum(working_time) as working_time, create_date, GROUP_CONCAT(start_time,'-',end_time) as start_time")
                 .eq("creator_id", userId).in("create_date", dateList).groupBy("create_date"));
         msg.data = list;
         return msg;

fhKeeper/formulahousekeeper/timesheet/src/views/workReport/daily.vue

@@ -4473,7 +4473,11 @@
                                         let datem = new Date(this.zhoData[m].zhoDataTime)
                                         if(datei[0] == datem.getFullYear() && datei[1] == (datem.getMonth() + 1) && datei[2] == datem.getDate()){
                                             this.$set(this.zhoData[m],'filledTime',res.data[i].workingTime)
-                                            let reportTimes = res.data[i].startTime.split(',')
+                                            let reportTimes = [];
+                                            if (res.data[i].startTime != null) {
+                                                reportTimes = res.data[i].startTime.split(',')
+                                            }
+                                            
                                             this.$set(this.zhoData[m],'reportTimes',reportTimes)
                                         }
                                     }