From 4d07c1c65427f6ba3cb968ddf0d0b2b669187575 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 24 May 2023 15:59:10 +0800
Subject: [PATCH] 添加巡逻路线
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/patrol/service/impl/PatrolTaskServiceImpl.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 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..9172a71 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,35 @@
}
@Override
- public IPage<PatrolTaskReport> getTaskReport(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
+ public IPage<PatrolTaskReport> getTaskReportPage(IPage<PatrolTaskReport> page,PatrolTaskReport patrolTaskReport) {
List<PatrolTaskReport> list = new ArrayList();
if (Func.equals(patrolTaskReport.getRegionFlag(),"0")){
//省 返回市
- list = baseMapper.getTaskReportProvince(page,patrolTaskReport);
+ list = baseMapper.getTaskReportProvincePage(page,patrolTaskReport);
}else if (Func.equals(patrolTaskReport.getRegionFlag(),"1")){
//市 返回区
- list = baseMapper.getTaskReportRegion(page,patrolTaskReport);
+ list = baseMapper.getTaskReportRegionPage(page,patrolTaskReport);
}else if (Func.equals(patrolTaskReport.getRegionFlag(),"2")){
//区 返回水库
- list = baseMapper.getTaskReportReservoir(page,patrolTaskReport);
+ list = baseMapper.getTaskReportReservoirPage(page,patrolTaskReport);
}
return page.setRecords(list);
+ }
+
+ @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);
+ }
+ return list;
}
@Override
@@ -245,6 +261,8 @@
return page.setRecords(list);
}
+
+
public void saveReport(PatrolTask patrolTask){
//拿到当前任务下的异常巡查记录
PatrolRecord patrolRecord = new PatrolRecord();
--
Gitblit v1.9.3