From 1df02b011c951ed5f57e40663e014fd913cbbe20 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Tue, 23 May 2023 19:44:53 +0800
Subject: [PATCH] 巡检报表接口
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 45 ++++++++++++++++++++++++++++++++++-----------
1 files changed, 34 insertions(+), 11 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 c25a0bd..ff86cf0 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
@@ -33,10 +33,7 @@
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;
@@ -212,14 +209,40 @@
}
@Override
- public List<PatrolTaskReport> getTaskReport(PatrolTaskReport patrolTaskReport) {
-
- if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
- return baseMapper.getTaskReportReservoir(patrolTaskReport);
- }else {
- return baseMapper.getTaskReportRegion(patrolTaskReport);
-
+ public IPage<PatrolTaskReport> getTaskReport(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
+ List<PatrolTaskReport> list = new ArrayList();
+ if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
+ //省 返回市
+ list = baseMapper.getTaskReportProvince(page,patrolTaskReport);
+ }else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
+ //市 返回区
+ list = baseMapper.getTaskReportRegion(page,patrolTaskReport);
+ }else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
+ //区 返回水库
+ list = baseMapper.getTaskReportReservoir(page,patrolTaskReport);
}
+ return page.setRecords(list);
+ }
+
+ @Override
+ public IPage<PatrolTaskReport> getTaskReportDetail(IPage<PatrolTaskReport> page, PatrolTaskReport patrolTaskReport) {
+
+ List<PatrolTaskReport> list = new ArrayList();
+ if (Func.isNotEmpty(patrolTaskReport.getReservoirId())){
+ //获取该水库的巡查
+ list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
+ }else {
+ String code = patrolTaskReport.getAdCode();
+ if (code.substring(0,4).indexOf("00") > -1) {
+ //前4位包含00 =》省
+ patrolTaskReport.setAdCode(code.substring(0,2));
+ } else if (code.substring(0,6).indexOf("00") > -1) {
+ //前六位包含00 =》市
+ patrolTaskReport.setAdCode(code.substring(0,4));
+ }
+ list = baseMapper.getTaskReportDetailRegion(page,patrolTaskReport);
+ }
+ return page.setRecords(list);
}
public void saveReport(PatrolTask patrolTask){
--
Gitblit v1.9.3