删除

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

@@ -92,7 +92,7 @@ public class ReportController {
             httpRespMsg.setError("验证失败");
             return httpRespMsg;
         }
-        return reportService.editReport(reportList);
+        return reportService.editReport(projectId, reportList, createDate.length > 0 ? createDate[0] : null);
     }
 
     /**

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

@@ -1,7 +1,7 @@
 package com.management.platform.service;
 
-import com.management.platform.entity.Report;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.management.platform.entity.Report;
 import com.management.platform.util.HttpRespMsg;
 
 import javax.servlet.http.HttpServletRequest;
@@ -22,7 +22,7 @@ public interface ReportService extends IService<Report> {
 
     HttpRespMsg getReport(String date, HttpServletRequest request);
 
-    HttpRespMsg editReport(List<Report> reportList);
+    HttpRespMsg editReport(Integer[] projectIds, List<Report> reportList, String date);
 
     HttpRespMsg deleteReport(Integer reportId);
 

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

@@ -236,9 +236,10 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     //新增或编辑报告
     @Override
-    public HttpRespMsg editReport(List<Report> reportList) {
+    public HttpRespMsg editReport(Integer[] projectIds, List<Report> reportList, String date) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         for (Report report : reportList) {
+            //获取一下信息
             if (report.getWorkingTime() <= 0.0) {
                 httpRespMsg.setError("工作时长必须大于零");
                 return httpRespMsg;
@@ -255,6 +256,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
                 }
             }
         }
+        if (reportList.size() > 0 && date != null) {
+            List<Integer> idList = new ArrayList<>();
+            for (Integer id : projectIds) {
+                if (id != -1) {
+                    idList.add(id);
+                }
+            }
+            reportMapper.delete(new QueryWrapper<Report>()
+                    .eq("create_date", date)
+                    .eq("creator_id", reportList.get(0).getCreatorId())
+                    .notIn("id", idList));
+        }
         return httpRespMsg;
     }