From 3ce737b52fca082ac3a2ecda4a848e2e4abcd0ee Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 06 Jul 2023 09:38:18 +0800
Subject: [PATCH] Merge branch 'jtdev' of https://hbsl-code.gistack.cn/hbwri/manager into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 30 ++++++++++++++++++++----------
1 files changed, 20 insertions(+), 10 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 1afab68..eb018e4 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
@@ -40,6 +40,7 @@
@Service
@AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService {
private final IFlowClient flowClient;
private final IPatrolRecordService patrolRecordService;
@@ -153,7 +154,9 @@
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 {
@@ -234,15 +237,22 @@
@Override
public List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport) {
List<PatrolTaskReport> list = new ArrayList();
- if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
- //省 返回市
- list = baseMapper.getTaskReportProvinceList(patrolTaskReport);
- }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
- //市 返回区
- list = baseMapper.getTaskReportRegionList(patrolTaskReport);
- }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
- //区 返回水库
- list = baseMapper.getTaskReportReservoirList(patrolTaskReport);
+
+ switch (patrolTaskReport.getRegionFlag()){
+ case "1": //省 获取市级数据
+ list = baseMapper.getCityReportList(patrolTaskReport);
+ break;
+ case "2"://市 获取区县级数据
+ list = baseMapper.getCountyReportList(patrolTaskReport);
+ break;
+ case "3"://区县 获取乡镇级数据
+ list = baseMapper.getTownReportList(patrolTaskReport);
+ break;
+ case "4"://乡镇 获取水库数据
+ list = baseMapper.getReservoirReportList(patrolTaskReport);
+ break;
+ default:
+ break;
}
return list;
}
@@ -269,7 +279,7 @@
}
-
+ @Transactional(rollbackFor = Exception.class)
public void saveReport(PatrolTask patrolTask){
//拿到当前任务下的异常巡查记录
PatrolRecord patrolRecord = new PatrolRecord();
--
Gitblit v1.9.3