From ca93fe7eb03bec91d5cb9f45ebb3b6c98819b7ff Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Dec 2023 18:01:09 +0800
Subject: [PATCH] 我的任务，里面审核搜索加上时间条件
---
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
index 7935a7a..e7bed77 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -181,17 +181,40 @@
@Override
public Object getGridStatistics(String code, String roleType) {
Map<String, Object> objectObjectHashMap = new HashMap<>();
- if (roleType.equals("1")) {
- Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId());
- Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId());
+ if (roleType.equals("2")) {
+ Integer gridStatistics = baseMapper.getGridStatistics(code, null, roleType);
+ Integer companyStatistics = baseMapper.getCompanyStatistics(code, null, roleType);
+ Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, null, roleType);
objectObjectHashMap.put("gridStatistics", gridStatistics);
objectObjectHashMap.put("companyStatistics", companyStatistics);
+ objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);
} else {
- Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId());
- Integer companyStatistics = baseMapper.getCompanyStatistics(code, null);
+ Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId(), roleType);
+ Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId(), roleType);
+ Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, AuthUtil.getUserId(), roleType);
objectObjectHashMap.put("gridStatistics", gridStatistics);
objectObjectHashMap.put("companyStatistics", companyStatistics);
+ objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);
+
}
return objectObjectHashMap;
}
+
+ /**
+ * 网格员表 自定义详情
+ */
+ @Override
+ public GridmanVO getDetail(GridmanEntity gridman) {
+ return baseMapper.getDetail(gridman);
+ }
+
+ /**
+ * 查询网格id
+ * @param userId
+ * @return
+ */
+ @Override
+ public Integer getGridIdByUserId(Long userId) {
+ return baseMapper.getGridIdByUserId(userId);
+ }
}
--
Gitblit v1.9.3