审核报告

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

@@ -114,20 +114,22 @@ public class ReportController {
 
     /**
      * 审批通过报告
-     * id 要通过的报告的id
+     * id 要通过的报告的用户id
+     * date 日期 格式yyyy-mm-dd
      */
     @RequestMapping("/approve")
-    public HttpRespMsg approveReport(Integer id, HttpServletRequest request) {
-        return reportService.approveReport(id, request);
+    public HttpRespMsg approveReport(@RequestParam Integer id, @RequestParam String date, HttpServletRequest request) {
+        return reportService.approveReport(id, date, request);
     }
 
     /**
      * 审批未通过报告 撤销通过报告
-     * id 要未通过的报告的id
+     * id 要未通过的报告的用户id
+     * date 日期 格式yyyy-mm-dd
      */
     @RequestMapping("/deny")
-    public HttpRespMsg denyReport(Integer id, HttpServletRequest request) {
-        return reportService.denyReport(id, request);
+    public HttpRespMsg denyReport(@RequestParam Integer id, @RequestParam String date, HttpServletRequest request) {
+        return reportService.denyReport(id, date, request);
     }
 }
 

fhKeeper/formulahousekeeper/management-platform/src/main/java/com/management/platform/entity/Report.java

@@ -1,6 +1,5 @@
 package com.management.platform.entity;
 
-import com.baomidou.mybatisplus.annotation.FieldStrategy;
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -61,7 +60,7 @@ public class Report extends Model<Report> {
     /**
      * 报告内容
      */
-    @TableField(value = "content", updateStrategy = FieldStrategy.IGNORED)
+    @TableField("content")
     private String content;
 
     /**

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

@@ -28,7 +28,7 @@ public interface ReportService extends IService<Report> {
 
     HttpRespMsg getUncensoredList(HttpServletRequest request);
 
-    HttpRespMsg approveReport(Integer id, HttpServletRequest request);
+    HttpRespMsg approveReport(Integer id, String date, HttpServletRequest request);
 
-    HttpRespMsg denyReport(Integer id, HttpServletRequest request);
+    HttpRespMsg denyReport(Integer id, String date, HttpServletRequest request);
 }

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

@@ -302,16 +302,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     //审核通过
     @Override
-    public HttpRespMsg approveReport(Integer id, HttpServletRequest request) {
+    public HttpRespMsg approveReport(Integer id, String date, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User user = userMapper.selectById(request.getHeader("Token"));
-            Report report = reportMapper.selectById(id);
-            Project project = projectMapper.selectById(report.getProjectId());
-            if (user.getRole() == 0 || !project.getCompanyId().equals(user.getCompanyId())) {
+            if (user.getRole() == 0) {
                 httpRespMsg.setError("无修改权限");
             } else {
-                reportMapper.updateById(report.setState(1));
+                reportMapper.update(new Report().setState(1),
+                        new QueryWrapper<Report>().eq("creator_id", id).eq("create_date", date));
             }
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");
@@ -322,16 +321,15 @@ public class ReportServiceImpl extends ServiceImpl<ReportMapper, Report> impleme
 
     //审核未通过 以及 撤销审核
     @Override
-    public HttpRespMsg denyReport(Integer id, HttpServletRequest request) {
+    public HttpRespMsg denyReport(Integer id, String date, HttpServletRequest request) {
         HttpRespMsg httpRespMsg = new HttpRespMsg();
         try {
             User user = userMapper.selectById(request.getHeader("Token"));
-            Report report = reportMapper.selectById(id);
-            Project project = projectMapper.selectById(report.getProjectId());
-            if (user.getRole() == 0 || !project.getCompanyId().equals(user.getCompanyId())) {
+            if (user.getRole() == 0) {
                 httpRespMsg.setError("无修改权限");
             } else {
-                reportMapper.updateById(report.setState(2));
+                reportMapper.update(new Report().setState(2),
+                        new QueryWrapper<Report>().eq("creator_id", id).eq("create_date", date));
             }
         } catch (NullPointerException e) {
             httpRespMsg.setError("验证失败");