巡查任务巡查责任人完成任务逻辑修改

guoshilong

2023-05-18 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java

@@ -64,9 +64,9 @@
     */
    @ApiOperation(value="获取所有巡查任务", notes="获取所有巡查任务")
    @GetMapping(value = "/all")
   public R getAll(){
       List<PatrolTask> list = patrolTaskService.list();
       return R.data(list);
   public R getAll(PatrolTaskVO patrolTaskVO){
       List<PatrolTask> list = patrolTaskService.getAll(patrolTaskVO);
      return R.data(list);
   }

   /**
@@ -187,13 +187,11 @@

   /**
    * 巡查人员完成任务
    *
    * @param patrolTask 任务
    */
   @PostMapping("patrol-complete-task")
   @ApiOperation(value = "完成任务", notes = "传入流程信息")
   public R completeTask(PatrolTask patrolTask, String currentUserId,String taskUser) {
      return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId,taskUser));
   public R completeTask(@RequestBody PatrolTaskVO patrolTaskVO) {
      return R.status(patrolTaskService.patrolCompleteTask(patrolTaskVO,patrolTaskVO.getCurrentUserId(),patrolTaskVO.getTaskUser()));
   }

   /**
@@ -214,6 +212,8 @@
   @ApiOperation(value = "查询待办")
   public R patrolTodoList(PatrolTaskVO patrolTask, Query query) {
      BladeFlow bladeFlow2 = new BladeFlow();
      //设置流程类型
      bladeFlow2.setCategory("flow_3");
      R<BladeFlowPage> res = flowClient.getTodoBladeFlowList(query.getSize(),query.getCurrent(),patrolTask.getCurrentUserId(), bladeFlow2);
      IPage<PatrolTask> patrolTaskIPage = new Page<>();
      List<PatrolTask> patrolTaskList = new ArrayList<>();
@@ -250,6 +250,8 @@
   @ApiOperation(value = "查询待办")
   public R patrolDoneList(PatrolTaskVO patrolTask, Query query){
      BladeFlowVO bladeFlow2 = new BladeFlowVO();
      //设置流程类型
      bladeFlow2.setCategory("flow_3");
      R<BladeFlowPage> res = flowClient.getDoneBladeFlowList(query.getSize(),query.getCurrent(),patrolTask.getCurrentUserId(), bladeFlow2);
      IPage<BladeFlowVO> bladeFlowVOIPage = new Page<>();
      List<BladeFlowVO> bladeFlowVOList = new ArrayList<>();