From 6cd2da8eb7d7aefecd96a19ebbfe9caba59ea88c Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Thu, 18 May 2023 14:25:58 +0800
Subject: [PATCH] 巡查任务巡查责任人完成任务逻辑修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
index 85b05de..870636e 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java
+++ b/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<>();
--
Gitblit v1.9.3