From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java | 51 +++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 47 insertions(+), 4 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 f90d4f8..46dd8fe 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
@@ -17,26 +17,28 @@
package org.springblade.modules.grid.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.excel.GridmanExcel;
-import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.grid.vo.GridmanVO;
import org.springblade.modules.grid.mapper.GridmanMapper;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
-import org.springblade.modules.system.entity.Dept;
+import org.springblade.modules.grid.vo.GridmanVO;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import java.util.Objects;
/**
@@ -164,4 +166,45 @@
saveOrUpdateGridman(gridmanEntity);
}
}
+
+ /**
+ * 网格员查询
+ *
+ * @param gridman
+ * @return
+ */
+ @Override
+ public List<GridmanVO> getGridmanList(GridmanVO gridman) {
+ return baseMapper.getGridmanList(gridman);
+ }
+
+ @Override
+ public Object getGridStatistics(String code, String roleType) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ 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(), 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);
+ }
}
--
Gitblit v1.9.3