优化

platform-dao/src/main/java/com/platform/dao/entity/fill/FillGatherTask.java

@@ -91,7 +91,7 @@ public class FillGatherTask implements Serializable {
      */
     private Integer lateHistoryHours;
     /**
-     * 变更记录
+     * 审核备注
      */
     private String recordJson;
     /**

platform-dao/src/main/java/com/platform/dao/enums/FillGatherTaskStatusEnum.java

@@ -22,7 +22,7 @@ public enum FillGatherTaskStatusEnum {
      */
     PROCESSING(1),
     /**
-     * 巡检完成
+     * 巡检完成--待主管审核
      */
     COMPLETED(2),
     /**
@@ -37,6 +37,14 @@ public enum FillGatherTaskStatusEnum {
      * 巡检暂停
      */
     PAUSE(5),
+    /**
+     * 巡检审核通过
+     */
+    SUCCESS(6),
+    /**
+     * 审核拒绝
+     */
+    REFUSED(7),
     ;
     private final Integer value;
 }

platform-rest/src/main/java/com/platform/rest/controller/fill/FillGatherTaskController.java

@@ -179,6 +179,20 @@ public class FillGatherTaskController {
         return new R<>();
     }
 
+    /**
+     *  审核巡检任务
+     * @param fillGatherTaskDTO 巡检任务DTO
+     * @return R
+     */
+    @SysLog("审核巡检任务")
+    @PutMapping("/verify/{id}")
+    @PreAuthorize("@pms.hasPermission('fill-tasks-dispatch')")
+    public R verify(@PathVariable("id") String id, @Validated({UpdateGroup.class}) @RequestBody FillGatherTaskDTO fillGatherTaskDTO) {
+        fillGatherTaskDTO.setId(id);
+        fillGatherTaskService.verifyTask(fillGatherTaskDTO);
+        return new R<>();
+    }
+
     /**
      *  巡检任务填报
      * @param fillGatherTaskDTO 巡检任务DTO

platform-service/src/main/java/com/platform/service/fill/FillGatherTaskService.java

@@ -73,4 +73,10 @@ public interface FillGatherTaskService extends IBaseService<FillGatherTask, Fill
 
     List<FillGatherTask> selectAll();
 
+    /**
+     * 巡检审核
+     * @param model
+     */
+    void verifyTask(FillGatherTaskDTO model);
+
                                                                                                                                                                                                                 }

platform-service/src/main/java/com/platform/service/fill/impl/FillGatherTaskServiceImpl.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageHelper;
 import com.platform.common.bean.AbstractPageResultBean;
 import com.platform.common.cache.ConfigCache;
 import com.platform.common.constant.RedisKeyConstants;
+import com.platform.common.exception.DeniedException;
 import com.platform.common.model.UserInfo;
 import com.platform.common.util.*;
 import com.platform.dao.bean.MyPage;
@@ -281,6 +282,21 @@ public class FillGatherTaskServiceImpl extends BaseServiceImpl<FillGatherTaskMap
         return mapper.selectAll();
     }
 
+    @Override
+    public void verifyTask(FillGatherTaskDTO model) {
+        if(StringUtils.isBlank(model.getId())){
+            throw new DeniedException("任务ID不能为空");
+        }
+        FillGatherTask task = new FillGatherTask();
+        task.setId(model.getId());
+        task.setRecordJson(model.getRecordJson());
+        task.setUpdateTime(LocalDateTime.now());
+        task.setStatus(model.getStatus());
+        mapper.updateByPrimaryKeySelective(task);
+        // 通知巡检人
+        //sendMessageToChecker(mapper.selectByPrimaryKey(task.getId()),null);
+    }
+
     /**
      * 给巡检人发送消息
      * @param task