From cb2d91135598d294c2f797671ab0f80a759cd9b5 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 26 Feb 2024 10:12:01 +0800
Subject: [PATCH] 历史巡查修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 8 +++++---
1 files changed, 5 insertions(+), 3 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 b109e77..98f79e8 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
@@ -170,7 +170,8 @@
BladeFlow flow = res.getData();
String taskId = flow.getTaskId();
String processInstanceId = patrolTask.getProcessInstanceId();
- String comment = patrolTask.getReport() ? "巡查任务发现问题" : "巡查任务完成，未发现问题";
+// String comment = patrolTask.getReport() ? "巡查任务发现问题" : "巡查任务完成，未发现问题";
+ String comment = patrolTask.getComment();
// 创建变量
Map<String, Object> variables = flow.getVariables();
if (variables == null) {
@@ -183,8 +184,9 @@
// 完成任务
flowClient.completeTask(taskId, processInstanceId, comment, variables);
//保存巡查记录
- patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
-
+ if (patrolTask.getPatrolRecordList() != null && patrolTask.getPatrolRecordList().size() > 0){
+ patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
+ }
// //查监测预警表，看是否有这个任务，有的话修改任务状态
// Boolean finishDamTask = nkyClient.finishTask(patrolTask.getId().toString());
--
Gitblit v1.9.3