修复2

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.util.ArrayList;
+import java.util.List;
 
 /**
  * <p>
@@ -46,25 +48,22 @@ public class ReportController {
         return reportService.getReport(date, request);
     }
 
-
     /**
      * 新增或编辑报告
-     * id 报告id 编辑时传
-     * projectId 报告相关项目id 新增时不可为空
-     * createDate 报告创建时间 新增时不可为空 yyyy-MM-dd
-     * workingTime 工作时间
-     * content 工作内容
+     * id 报告id 数组 编辑时需要指定
+     * projectId 报告相关项目id 数组 新增时需要指定
+     * workingTime 工作时间 数组
+     * content 工作内容 数组
+     * createDate 报告日期 传一个即可
      */
-    @RequestMapping("/editReport")
-    public HttpRespMsg editReport(Report[] report) {
-        return reportService.editReport(report, request);
-    }
-
-
 //    @RequestMapping("/editReport")
-//    public HttpRespMsg editReport2(
-//            String[] id, Integer[] projectId, String createTime, Double[] workingTime, String[] content) {
-//        Report[] reportList = new
+//    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);
 //    }
 

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

@@ -71,7 +71,7 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
             Map<String, Object> resultMap = new HashMap<>();
             //获取某日本人的所有日志
             resultMap.put("report", reportMapper.selectList(new QueryWrapper<Report>()
-                    .eq("user_id", userId)));
+                    .eq("creator_id", userId)));
             //顺便再获取一下可分配时间
             Double totalWorkingTime = 0.0;
             //此处认为0是工作时间