Merge branch 'master' of http://47.100.37.243:10080/wutt/manHourHousekeeper

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

@@ -679,22 +679,23 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
     //新增或编辑报告
     @Override
     public HttpRespMsg editReport(List<Report> reportList, String date, List<User> userList, BigDecimal hourCost, Integer companyId) {
-//        System.out.println("传过来的数据"+reportList.toString()+"=========="+reportList.size()+"===="+reportList.get(0));
+        System.out.println("date"+date);
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         TimeType timeType = timeTypeMapper.selectById(companyId);
         //删除不在本次更新名单中的老记录
         List<Integer> idList = reportList.stream().filter(r->r.getId() != null).map(Report::getId).collect(Collectors.toList());
-        if (date != null && !date.contains("@")) {
-            //取到已有记录的id集合
-            if (idList.size() > 0) {
+        //只有填写日报的report才会有id, 前端会把全部状态的日报都传过来
+        if (idList.size() > 0) {
+            if (date != null && !date.contains("@")) {
+                //取到已有记录的id集合
                 reportMapper.delete(new QueryWrapper<Report>()
                         .eq("create_date", date)
                         .eq("creator_id", reportList.get(0).getCreatorId())
+                        .ne("state", 0)//后端也要做安全校验，把待审核和已通过的排除，防止误删
+                        .ne("state", 1)
                         .notIn("id", idList));
             }
-        }
-        //已通过和待审核状态的不需要处理
-        if (idList.size() > 0) {
+            //已通过和待审核状态的不需要处理
             List<Report> existsReportList = reportMapper.selectList(new QueryWrapper<Report>().select("id, state").in("id", idList));
             if (existsReportList.size() > 0) {
                 List<Integer> ignoreIds = existsReportList.stream().filter(ex -> ex.getState() == 0 || ex.getState() == 1).map(Report::getId).collect(Collectors.toList());

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

@@ -224,7 +224,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
             //表头
             HSSFCell headCell;
             headCell = headRow.createCell(0);
-            headCell.setCellValue("标题");
+            headCell.setCellValue("任务内容");
             headCell.setCellStyle(headStyle);
             headCell = headRow.createCell(1);
             headCell.setCellValue("项目");
@@ -268,7 +268,7 @@ public class TaskServiceImpl extends ServiceImpl<TaskMapper, Task> implements Ta
                     isExpired = true;
                 }
                 row.createCell(7).setCellValue(isExpired?"Y":"N");
-                row.createCell(8).setCellValue(task.getPlanHours());
+                row.createCell(8).setCellValue(task.getPlanHours()==null?"": task.getPlanHours().toString());
                 row.createCell(9).setCellValue(task.getWorkHours());
                 rowNum++;
             }

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

@@ -4702,6 +4702,9 @@
                                     formData.append("professionProgress", "[]")
                                     if (zhoD[j].groupId) {
                                         formData.append("groupId",zhoD[j].groupId)
+                                    } else {
+                                        //解决后台groupId数组越界的问题
+                                        formData.append("groupId",0)
                                     }
                                     zhoD[j].stage ? formData.append("stage", zhoD[j].stage) : formData.append("stage", '');
                                     formData.append("createDate",zhoD.zhoDataTime)