From 8dab1f5e6ae80f6808d818ba799d38bb0ef4e699 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 20:37:45 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 82 +++++++++++++++++++++++++++++++----------
1 files changed, 62 insertions(+), 20 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 0ed19f7..3c0870b 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -30,8 +30,10 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -59,13 +61,19 @@
@Autowired
private IUserService userService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
// doInsert();
// 执行业务等
-
+ Dept dept = deptService.getById(AuthUtil.getDeptId());
+ if (null!=dept){
+ household.setRegionCode(dept.getRegionCode());
+ }
List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
// 遍历
// for (HouseholdVO householdVO : householdVOS) {
@@ -168,25 +176,11 @@
* @param household
*/
public void updateUserInfo(HouseholdEntity household) {
- // 判断用户是否为业主，如果是业主，判断该房屋是否已有业主，如果有则提示已有业主，无法设置为业主，不是业主则不操作
+ // 判断用户是否为业主，如果是业主，则新增
if (null!=household.getRelationship() && household.getRelationship()==1){
// 如果为业主
- // 查询当前房屋是否已有业主
- QueryWrapper<HouseholdEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0)
- .eq("house_code",household.getHouseCode())
- .eq("relationship",1);
- List<HouseholdEntity> list = list(queryWrapper);
- if (list.size()==0){
- // 新增用户
- bindUserHandle(household);
- }else {
- HouseholdEntity householdEntity = list.get(0);
- if (null == householdEntity.getAssociatedUserId()){
- // 新增用户
- bindUserHandle(household);
- }
- }
+ // 新增用户
+ bindUserHandle(household);
}
}
@@ -269,8 +263,8 @@
* @return
*/
@Override
- public Integer statistics(Long userId) {
- return baseMapper.statistics(userId);
+ public Integer statistics(Long userId,String neiCode) {
+ return baseMapper.statistics(userId,neiCode);
}
/**
@@ -312,4 +306,52 @@
}
}
+
+ /**
+ * 住户业主信息处理，将业主人员插入到用户表
+ * @return
+ */
+ @Override
+ public Object userHandle() {
+ // 查询所有未入库的业主信息
+ List<HouseholdEntity> householdEntityList = baseMapper.getNotInsertUserHousehold();
+ // 批量入用户库
+ for (HouseholdEntity householdEntity : householdEntityList) {
+ // 根据手机号查询对应账号和手机号的用户信息
+ List<User> userList = userService.getUserListByPhoneOrAccount(householdEntity.getPhoneNumber());
+ if (userList.size()>0){
+ User user = userList.get(0);
+ householdEntity.setAssociatedUserId(user.getId());
+ // 更新
+ updateById(householdEntity);
+ // 判断用户是否包含了居民角色,不包含则需更新
+ if (!user.getRoleId().contains("1717429059648606209")){
+ user.setRoleId(user.getRoleId() + ",1717429059648606209");
+ //更新
+ userService.updateById(user);
+ }
+ }else {
+ // 插入用户信息
+ //如果用户不存在，则新增一个用户
+ User newUser = new User();
+ newUser.setAccount(householdEntity.getPhoneNumber());
+ newUser.setPhone(householdEntity.getPhoneNumber());
+ newUser.setName(householdEntity.getName());
+ newUser.setRealName(householdEntity.getName());
+ // 社区群众部门
+ newUser.setDeptId("1727979636479037441");
+ // 目前暂定居民角色，
+ newUser.setRoleId("1717429059648606209");
+ //默认密码为 123456
+ newUser.setPassword("123456");
+ // 用户新增
+ boolean submit = userService.submit(newUser);
+ // 更新绑定用户信息
+ householdEntity.setAssociatedUserId(newUser.getId());
+ // 更新
+ updateById(householdEntity);
+ }
+ }
+ return null;
+ }
}
--
Gitblit v1.9.3