新增报告

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

@@ -11,6 +11,8 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -50,22 +52,32 @@ public class ReportController {
 
     /**
      * 新增或编辑报告
-     * id 报告id 数组 编辑时需要指定
-     * projectId 报告相关项目id 数组 新增时需要指定
+     * id 报告id 数组
+     * projectId 报告相关项目id 数组
      * workingTime 工作时间 数组
      * content 工作内容 数组
-     * createDate 报告日期 传一个即可
+     * createDate 报告日期 数组
      */
-//    @RequestMapping("/editReport")
-//    public HttpRespMsg editReport2(Integer[] id, Integer[] projectId, Double[] workingTime, String[] content,
-//                                   String createDate) {
-//        List<Report> reportList = new ArrayList<>();
-//        for (int i = 0; i < reportList.projectId; i++) {
-//            reportList[i].setId(id[i]).setCreatorId(request.getHeader("Token")).setContent();
-//        }
-//
-//        return reportService.editReport(reportList, request);
-//    }
+    @RequestMapping("/editReport")
+    public HttpRespMsg editReport2(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;
+            }
+        }
+        return reportService.editReport(reportList);
+    }
 
     /**
      * 删除报告

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

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.management.platform.util.HttpRespMsg;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.List;
 
 /**
  * <p>
@@ -19,7 +20,7 @@ public interface ReportService extends IService<Report> {
 
     HttpRespMsg getReport(String date, HttpServletRequest request);
 
-    HttpRespMsg editReport(Report[] reportList, HttpServletRequest request);
+    HttpRespMsg editReport(List<Report> reportList);
 
     HttpRespMsg deleteReport(Integer reportId);
 }

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

@@ -93,28 +93,18 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     //新增或编辑报告
     @Override
-    public HttpRespMsg editReport(Report[] reportList, HttpServletRequest request) {
+    public HttpRespMsg editReport(List<Report> reportList) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
-        try {
-            for (Report report : reportList) {
-                report.setCreatorId(request.getHeader("Token"));
-                if (report.getId() == null) {
-                    //新增报告时 需要检查项目和人员id
-                    if (report.getProjectId() == null) {
-                        httpRespMsg.setError("请填写完整信息");
-                    } else {
-                        if (reportMapper.insert(report) == 0) {
-                            httpRespMsg.setError("操作失败");
-                        }
-                    }
-                } else {
-                    if (reportMapper.updateById(report) == 0) {
-                        httpRespMsg.setError("操作失败");
-                    }
+        for (Report report : reportList) {
+            if (report.getId() == null) {
+                if (reportMapper.insert(report) == 0) {
+                    httpRespMsg.setError("操作失败");
+                }
+            } else {
+                if (reportMapper.updateById(report) == 0) {
+                    httpRespMsg.setError("操作失败");
                 }
             }
-        } catch (NullPointerException e) {
-            httpRespMsg.setError("验证失败");
         }
         return httpRespMsg;
     }