From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java | 106 +++++++++++++++++++++++++++++++++++++---------------
1 files changed, 75 insertions(+), 31 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..baaebc7 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
@@ -18,9 +18,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
+import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
+import org.springblade.common.cache.SysCache;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
+import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.excel.GridmanExcel;
@@ -28,9 +33,7 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
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;
@@ -56,16 +59,16 @@
@Autowired
private IGridService gridService;
- @Autowired
- private IRegionService regionService;
-
@Override
public IPage<GridmanVO> selectGridmanPage(IPage<GridmanVO> page, GridmanVO gridman) {
- return page.setRecords(baseMapper.selectGridmanPage(page, gridman));
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
+ return page.setRecords(baseMapper.selectGridmanPage(page, gridman, regionChildCodesList, isAdministrator));
}
/**
* 网格员表 自定义新增或修改
+ *
* @param gridman
* @return
*/
@@ -74,16 +77,20 @@
public boolean saveOrUpdateGridman(GridmanEntity gridman) {
boolean flag = false;
// 修改
- if (null!=gridman.getId()) {
+ if (null != gridman.getId()) {
// 更新网格员信息
flag = updateById(gridman);
- }else {
+ } else {
// 新增
// 先判断用户表中是否已存在该用户，如果已存在则不新增，需要更新角色
QueryWrapper<User> wrapper = new QueryWrapper<>();
wrapper.eq("is_deleted", 0).eq("account", gridman.getMobile());
List<User> list = userService.list(wrapper);
// 更新用户，查询是否需要更新角色
+ // 查询网格id
+ IGridService bean = SpringUtil.getBean(IGridService.class);
+ GridEntity gridEntity = bean.getOne(Wrappers.<GridEntity>lambdaQuery().eq(GridEntity::getGridCode, gridman.getGridCode()));
+ gridman.setGridId(gridEntity.getId());
if (list.size() > 0) {
// 默认取出第一个
User user = list.get(0);
@@ -95,11 +102,26 @@
}
//插入网格员信息
gridman.setUserId(user.getId());
- flag = save(gridman);
+ //匹配
+ QueryWrapper<GridmanEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted", 0)
+ .eq("grid_id", gridman.getGridId())
+ .eq("user_id", gridman.getUserId());
+ GridmanEntity one = getOne(queryWrapper);
+ if (null == one) {
+ flag = save(gridman);
+ }
} else {
saveUser(gridman);
- // 插入网格员信息
- flag = save(gridman);
+ //匹配
+ QueryWrapper<GridmanEntity> queryWrapper = new QueryWrapper<>();
+ queryWrapper.eq("is_deleted", 0)
+ .eq("grid_id", gridman.getGridId())
+ .eq("user_id", gridman.getUserId());
+ GridmanEntity one = getOne(queryWrapper);
+ if (null == one) {
+ flag = save(gridman);
+ }
}
}
// 返回
@@ -108,6 +130,7 @@
/**
* 用户新增
+ *
* @param gridman
*/
public void saveUser(GridmanEntity gridman) {
@@ -135,35 +158,27 @@
/**
* 网格员导入
+ *
* @param data
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importGridman(List<GridmanExcel> data, Boolean isCovered) {
// 遍历
for (GridmanExcel gridmanExcel : data) {
GridmanEntity gridmanEntity = Objects.requireNonNull(BeanUtil.copy(gridmanExcel, GridmanEntity.class));
- // 先查询当前网格社区对应的机构id
- QueryWrapper<Region> regionWrapper = new QueryWrapper<>();
- regionWrapper.eq("name",gridmanExcel.getCommunityName());
- Region region = regionService.getOne(regionWrapper);
// 通过社区名称和网格名称获取网格id
QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0)
- .eq("community_code",region.getCode())
- .eq("grid_name",gridmanExcel.getGridName());
+ queryWrapper.eq("is_deleted", 0)
+ .eq("grid_code", gridmanExcel.getGridCode());
GridEntity gridEntity = gridService.getOne(queryWrapper);
// 设置网格id
gridmanEntity.setGridId(gridEntity.getId());
- // 通过手机号查询网格员id
- QueryWrapper<GridmanEntity> wrapper = new QueryWrapper<>();
- wrapper.eq("is_deleted",0).eq("mobile",gridmanEntity.getMobile());
- GridmanEntity one = getOne(wrapper);
- if (one!=null){
- gridmanEntity.setId(one.getId());
- }
// 插入网格员
- saveOrUpdateGridman(gridmanEntity);
+ if (!Strings.isBlank(gridmanExcel.getMobile())) {
+ saveOrUpdateGridman(gridmanEntity);
+ }
}
}
@@ -181,17 +196,46 @@
@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);
+ }
+
+ @Override
+ public List<UserEntity> getGridManByCode(String houseCode) {
+ return baseMapper.getGridManByCode(houseCode);
+ }
}
--
Gitblit v1.9.3