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/service/impl/PatrolTaskServiceImpl.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
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 7437fb2..00a5245 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
@@ -137,8 +137,8 @@
}
@Override
- @Transactional
- public boolean patrolCompleteTask(PatrolTask patrolTask,String currentUserId,String taskUser) {
+ @Transactional(rollbackFor = Exception.class)
+ public boolean patrolCompleteTask(PatrolTaskVO patrolTask,String currentUserId,String taskUser) {
R<BladeFlow> res = flowClient.getBladeFlow(patrolTask.getId().toString(),currentUserId);
if (res.isSuccess()){
BladeFlow flow = res.getData();
@@ -156,6 +156,7 @@
// 完成任务
flowClient.completeTask(taskId,processInstanceId,comment,variables);
saveReport(patrolTask);
+ patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
return baseMapper.updateById(patrolTask) >0;
}else {
return false;
@@ -204,6 +205,11 @@
return baseMapper.customizeGetById(businessId);
}
+ @Override
+ public List<PatrolTask> getAll(PatrolTaskVO patrolTaskVO) {
+ return baseMapper.getAll(patrolTaskVO);
+ }
+
public void saveReport(PatrolTask patrolTask){
//拿到当前任务下的异常巡查记录
PatrolRecord patrolRecord = new PatrolRecord();
--
Gitblit v1.9.3