修改报告

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

@@ -59,22 +59,28 @@ public class ReportController {
      * createDate 报告日期 数组
      */
     @RequestMapping("/editReport")
-    public HttpRespMsg editReport2(Integer[] id, Integer[] projectId, Double[] workingTime, String[] content,
-                                   String[] createDate) {
+    public HttpRespMsg editReport(Integer[] id, Integer[] projectId, Double[] workingTime, String[] content,
+                                  String[] createDate) {
         List<Report> reportList = new ArrayList<>();
-        for (int i = 0; i < id.length; i++) {
-            reportList.add(new Report()
-                    .setId(id[i])
-                    .setProjectId(projectId[i])
-                    .setWorkingTime(workingTime[i])
-                    .setContent(content[i])
-                    .setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
-                    .setCreatorId(request.getHeader("Token")));
-            if (createDate[i] == null || projectId[i] == null) {
-                HttpRespMsg httpRespMsg = new HttpRespMsg();
-                httpRespMsg.setError("缺少数据");
-                return httpRespMsg;
+        try {
+            for (int i = 0; i < id.length; i++) {
+                reportList.add(new Report()
+                        .setId(id[i] == -1 ? null : id[i])
+                        .setProjectId(projectId[i])
+                        .setWorkingTime(workingTime[i])
+                        .setContent(content[i])
+                        .setCreateDate(LocalDate.parse(createDate[i], DateTimeFormatter.ofPattern("yyyy-MM-dd")))
+                        .setCreatorId(request.getHeader("Token")));
+                if (createDate[i] == null || projectId[i] == null) {
+                    HttpRespMsg httpRespMsg = new HttpRespMsg();
+                    httpRespMsg.setError("缺少数据");
+                    return httpRespMsg;
+                }
             }
+        } catch (NullPointerException e) {
+            HttpRespMsg httpRespMsg = new HttpRespMsg();
+            httpRespMsg.setError("缺少数据");
+            return httpRespMsg;
         }
         return reportService.editReport(reportList);
     }