From 671e04db32af296f461b3b3dc71fbcbe03d2a357 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 28 Apr 2023 00:30:01 +0800
Subject: [PATCH] 巡查人员完成任务接口字段添加
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml | 2 +-
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 4 ++--
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/controller/PatrolTaskController.java | 4 ++--
4 files changed, 6 insertions(+), 6 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 8c6dff3..b7988f6 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
@@ -188,8 +188,8 @@
*/
@PostMapping("patrol-complete-task")
@ApiOperation(value = "完成任务", notes = "传入流程信息")
- public R completeTask(PatrolTask patrolTask, String currentUserId) {
- return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId));
+ public R completeTask(PatrolTask patrolTask, String currentUserId,String taskUser) {
+ return R.status(patrolTaskService.patrolCompleteTask(patrolTask,currentUserId,taskUser));
}
/**
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
index eaad857..b9bdfb0 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/mapper/PatrolTaskMapper.xml
@@ -128,7 +128,7 @@
where spt.id = #{id}
</select>
<select id="customizeGetById" resultType="cn.gistack.sm.patrol.entity.PatrolTask">
- SELECT T.ID,T.TITLE,T.TO_USER_ID,A.PROBLEM_COUNT,T.PROJECT_ID,T.CONTENT FROM SM_PATROL_TASK T
+ SELECT T.ID,T.TITLE,T.TO_USER_ID,A.PROBLEM_COUNT,T.PROJECT_ID,T.CONTENT,T.STATE FROM SM_PATROL_TASK T
LEFT JOIN (
SELECT COUNT(*) PROBLEM_COUNT,R.TASK_ID FROM SM_PATROL_REPORT R WHERE R.TASK_ID = #{id} AND R.STATUS = 2 GROUP BY R.TASK_ID
)A ON A.TASK_ID = T.ID
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
index 26c2c29..104d86d 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/IPatrolTaskService.java
@@ -57,7 +57,7 @@
*/
boolean startProcess(PatrolTask patrolTask);
- boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId);
+ boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser);
boolean chargeCompletePerson(BladeFlowTask bladeFlowTask);
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
index ae73771..0855417 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java
@@ -138,7 +138,7 @@
@Override
@Transactional
- public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId) {
+ public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser) {
R<BladeFlow> res = flowClient.getBladeFlow(patrolTask.getId().toString(),currentUserId);
if (res.isSuccess()){
BladeFlow flow = res.getData();
@@ -152,7 +152,7 @@
variables = Kv.create();
}
variables.put(ProcessConstant.REPORT_KEY,patrolTask.getReport());
- variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, "1650048152667467777"));
+ variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
// 完成任务
flowClient.completeTask(taskId,processInstanceId,comment,variables);
saveReport(patrolTask);
--
Gitblit v1.9.3