From 4dbe749ae7f891ed1ca3ea9a9b409133faf9cd6e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Mar 2024 15:28:43 +0800
Subject: [PATCH] 查询未绑定网格或警格的数据
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 37 ++++++++++++++++++++++++-------------
1 files changed, 24 insertions(+), 13 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
index 0d94abf..b450c26 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java
@@ -21,10 +21,11 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
-import org.springblade.common.cache.SysCache;
+import org.springblade.common.constant.CommonConstant;
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseRentalEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
@@ -36,9 +37,7 @@
import org.springblade.modules.house.vo.HouseRentalTenantVO;
import org.springblade.modules.house.vo.HouseRentalVO;
import org.springblade.modules.house.vo.HouseholdVO;
-import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.User;
-import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -234,17 +233,32 @@
List<HouseholdEntity> addList = new ArrayList<>();
List<HouseholdEntity> updateList = new ArrayList<>();
List<HouseholdEntity> removeList = new ArrayList<>();
+ List<User> addUserList = new ArrayList<>();
+// List<User> updateUserList = new ArrayList<>();
+// List<User> removeUserList = new ArrayList<>();
// 找出需要新增的，否则组成新集合进行比对
List<String> phoneList = new ArrayList<>();
-
+ IUserService userService = SpringUtils.getBean(IUserService.class);
for (HouseholdEntity householdEntity : list) {
if (null == householdEntity.getId()) {
- // 新增
+ // 新增用戶
+ User user = new User();
+ user.setAccount(householdEntity.getPhoneNumber());
+ user.setUserType(1);
+ user.setRealName(householdEntity.getName());
+ user.setName(householdEntity.getName());
+ user.setPassword(DigestUtil.encrypt(CommonConstant.DEFAULT_PASSWORD));
+ user.setRoleId("1717429059648606209");
+ boolean save = userService.save(user);
+ // 新增住户
householdEntity.setHouseCode(houseRental.getHouseCode());
householdEntity.setHousingRentalId(houseRental.getId());
householdEntity.setRelationship(18);
householdEntity.setResidentialStatus(1);
householdEntity.setRoleType(2);
+ if (save) {
+ householdEntity.setAssociatedUserId(user.getId());
+ }
addList.add(householdEntity);
phoneList.add(householdEntity.getPhoneNumber());
} else {
@@ -303,15 +317,12 @@
*/
@Override
public Object getStatistics(HouseRentalTenantVO houseRental) {
- List<String> list = new ArrayList<>();
- if (null != houseRental.getRoleName() && !houseRental.getRoleName().equals("")) {
- if (houseRental.getRoleName().equals("网格员")) {
- // 查询对应的房屋地址code
- list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
- }
- }
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
// 查询
- List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental, list);
+ List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,
+ commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getIsAdministrator());
// 返回
return statistics;
}
--
Gitblit v1.9.3