From 916b76ee90fceff31fe7969db9d9da995d919d52 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Fri, 28 Jul 2023 17:05:26 +0800
Subject: [PATCH] 巡查报表接口修改

---
 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java |   65 +++++++++++++++++++++++++++++---
 1 files changed, 59 insertions(+), 6 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 00a5245..c3120e2 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,7 +15,9 @@
 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 cn.gistack.sm.patrol.vo.TaskStatusCount;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import lombok.AllArgsConstructor;
 import org.springblade.core.log.exception.ServiceException;
@@ -32,16 +34,14 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import java.net.http.HttpRequest;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static org.springblade.core.launch.constant.FlowConstant.TASK_USR_PREFIX;
 
 @Service
 @AllArgsConstructor
+@Transactional(rollbackFor = Exception.class)
 public class PatrolTaskServiceImpl extends BaseServiceImpl<PatrolTaskMapper, PatrolTask> implements IPatrolTaskService {
 	private final IFlowClient flowClient;
 	private final IPatrolRecordService patrolRecordService;
@@ -155,8 +155,11 @@
 			variables.put("taskUser",StringUtil.format("{}{}", TASK_USR_PREFIX, taskUser));
 			// 完成任务
 			flowClient.completeTask(taskId,processInstanceId,comment,variables);
-			saveReport(patrolTask);
+			//保存巡查记录
 			patrolRecordService.saveBatch(patrolTask.getPatrolRecordList());
+			//保存上报
+			//停用
+//			saveReport(patrolTask);
 			return baseMapper.updateById(patrolTask) >0;
 		}else {
 			return  false;
@@ -201,7 +204,7 @@
 	}
 
 	@Override
-	public PatrolTask customizeGetById(String businessId) {
+	public PatrolTaskVO customizeGetById(String businessId) {
 		return baseMapper.customizeGetById(businessId);
 	}
 
@@ -210,6 +213,56 @@
 		return baseMapper.getAll(patrolTaskVO);
 	}
 
+	@Override
+	public IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
+		List<PatrolTaskReport> list  = new ArrayList<>();
+
+		//获取行政区划统计报表
+		if (patrolTaskReport.getRegionFlag().equals("1")){
+			list = baseMapper.getRegionReportPage(page,patrolTaskReport);
+		}else {
+			//获取水库巡查报表
+			list = baseMapper.getReservoirReportPage(page,patrolTaskReport);
+		}
+		return page.setRecords(list);
+	}
+
+	@Override
+	public List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport) {
+		List<PatrolTaskReport> list = new ArrayList();
+
+		//获取行政区划统计报表
+		if (patrolTaskReport.getRegionFlag().equals("1")){
+			list = baseMapper.getRegionReportList(patrolTaskReport);
+		}else {
+			//获取水库巡查报表
+			list = baseMapper.getReservoirReportList(patrolTaskReport);
+		}
+		return list;
+	}
+
+	@Override
+	public List<TaskStatusCount> getTaskStatusCount(PatrolTaskVO patrolTaskVO) {
+		return baseMapper.getTaskStatusCount(patrolTaskVO);
+	}
+
+	@Override
+	public List<TaskStatusCount> getTaskTypeCount(PatrolTaskVO patrolTaskVO) {
+		return baseMapper.getTaskTypeCount(patrolTaskVO);
+	}
+
+	@Override
+	public IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport) {
+
+		List<PatrolTaskReport> list = new ArrayList();
+
+		list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
+
+		return page.setRecords(list);
+	}
+
+
+	@Transactional(rollbackFor = Exception.class)
 	public void saveReport(PatrolTask patrolTask){
 		//拿到当前任务下的异常巡查记录
 		PatrolRecord patrolRecord = new PatrolRecord();

--
Gitblit v1.9.3