From 1d725aba58f4bec25385ecccb3650032cca06421 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 22 May 2023 19:51:55 +0800
Subject: [PATCH] 巡查报表接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 22 ++++++++++++++++++++--
1 files changed, 20 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..c25a0bd 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
@@ -15,6 +15,7 @@
import cn.gistack.sm.patrol.util.EnhancementServicesTool;
import cn.gistack.sm.patrol.util.IdWorker;
import cn.gistack.sm.patrol.vo.BladeFlowTask;
+import cn.gistack.sm.patrol.vo.PatrolTaskReport;
import cn.gistack.sm.patrol.vo.PatrolTaskVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import lombok.AllArgsConstructor;
@@ -137,8 +138,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();
@@ -155,6 +156,7 @@
variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
// 完成任务
flowClient.completeTask(taskId,processInstanceId,comment,variables);
+ patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
saveReport(patrolTask);
return baseMapper.updateById(patrolTask) >0;
}else {
@@ -204,6 +206,22 @@
return baseMapper.customizeGetById(businessId);
}
+ @Override
+ public List<PatrolTask> getAll(PatrolTaskVO patrolTaskVO) {
+ return baseMapper.getAll(patrolTaskVO);
+ }
+
+ @Override
+ public List<PatrolTaskReport> getTaskReport(PatrolTaskReport patrolTaskReport) {
+
+ if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
+ return baseMapper.getTaskReportReservoir(patrolTaskReport);
+ }else {
+ return baseMapper.getTaskReportRegion(patrolTaskReport);
+
+ }
+ }
+
public void saveReport(PatrolTask patrolTask){
//拿到当前任务下的异常巡查记录
PatrolRecord patrolRecord = new PatrolRecord();
--
Gitblit v1.9.3