From f20611265f7d34fd4fbcdfdaff6cb9cccd0b25fc Mon Sep 17 00:00:00 2001
From: shenyijian <1178253012@qq.com>
Date: Fri, 21 Jun 2024 11:53:21 +0800
Subject: [PATCH] 湖北水库:施工:项目查询过滤无效修复、根据角色查询用户

---
 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