From e6af240082f6cc26c41d44bb55a653269b0f5b77 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 05 Jun 2023 15:44:24 +0800
Subject: [PATCH] 巡检报表修改
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 37 +++++++++++++++++++++++++++++++------
1 files changed, 31 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 ff86cf0..1afab68 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
@@ -199,7 +199,7 @@
}
@Override
- public PatrolTask customizeGetById(String businessId) {
+ public PatrolTaskVO customizeGetById(String businessId) {
return baseMapper.customizeGetById(businessId);
}
@@ -209,19 +209,42 @@
}
@Override
- public IPage<PatrolTaskReport> getTaskReport(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
+ public IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
+ List<PatrolTaskReport> list = new ArrayList();
+
+ switch (patrolTaskReport.getRegionFlag()){
+ case "1": //省 获取市级数据
+ list = baseMapper.getCityReportPage(page,patrolTaskReport);
+ break;
+ case "2"://市 获取区县级数据
+ list = baseMapper.getCountyReportPage(page,patrolTaskReport);
+ break;
+ case "3"://区县 获取乡镇级数据
+ list = baseMapper.getTownReportPage(page,patrolTaskReport);
+ break;
+ case "4"://乡镇 获取水库数据
+ list = baseMapper.getReservoirReportPage(page,patrolTaskReport);
+ break;
+ default:
+ break;
+ }
+ return page.setRecords(list);
+ }
+
+ @Override
+ public List<PatrolTaskReport> getTaskReportList(PatrolTaskReport patrolTaskReport) {
List<PatrolTaskReport> list = new ArrayList();
if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
//省 返回市
- list = baseMapper.getTaskReportProvince(page,patrolTaskReport);
+ list = baseMapper.getTaskReportProvinceList(patrolTaskReport);
}else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
//市 返回区
- list = baseMapper.getTaskReportRegion(page,patrolTaskReport);
+ list = baseMapper.getTaskReportRegionList(patrolTaskReport);
}else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
//区 返回水库
- list = baseMapper.getTaskReportReservoir(page,patrolTaskReport);
+ list = baseMapper.getTaskReportReservoirList(patrolTaskReport);
}
- return page.setRecords(list);
+ return list;
}
@Override
@@ -245,6 +268,8 @@
return page.setRecords(list);
}
+
+
public void saveReport(PatrolTask patrolTask){
//拿到当前任务下的异常巡查记录
PatrolRecord patrolRecord = new PatrolRecord();
--
Gitblit v1.9.3