From fc2adc3521931c2f7bc5b2f3a3d94ebf407828d6 Mon Sep 17 00:00:00 2001
From: yxm <zhp1521624>
Date: Mon, 01 Jul 2024 09:40:55 +0800
Subject: [PATCH] 水库堤防白蚁普查资料当前页压缩导出新增条件优化v20240701
---
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java | 25 ++++++++++++++++++-------
1 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
index 0b2885d..bec5525 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/jcsb/service/impl/DbReportServiceImpl.java
@@ -30,14 +30,25 @@
list = baseMapper.getDayList(dbReport);
}
- }else if (dbReport.getTimeFlag().equals("year")){
-// if (dbReport.getType().equals("wy")){
-// //位移
-// list = baseMapper.getYearListWy(dbReport);
-// }else{
-// list = baseMapper.getYearList(dbReport);
-// }
+ }else if (dbReport.getTimeFlag().equals("month")){
+ if (dbReport.getType().equals("wy")){
+ //位移
+ list = baseMapper.getMonthListWy(dbReport);
+ }else{
+ list = baseMapper.getMonthList(dbReport);
+ }
+ } else if (dbReport.getTimeFlag().equals("year")) {
+ if (dbReport.getType().equals("wy")){
+ //位移
+ list = baseMapper.getYearListWy(dbReport);
+ }else{
+ list = baseMapper.getYearList(dbReport);
+ }
+
+
}
+
+
return list;
}
--
Gitblit v1.9.3