From ced3a95b1d42c70453fdca63ce67af2ae3fa014e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 20 Mar 2024 11:54:27 +0800
Subject: [PATCH] 住户导入修改
---
src/main/java/org/springblade/modules/house/service/impl/HouseRentalServiceImpl.java | 65 ++++++++++++++++++++++----------
1 files changed, 45 insertions(+), 20 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 fc32ad9..0abffb9 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;
@@ -67,14 +66,15 @@
/**
* 自定义分页查询
+ *
* @param page
* @param houseRental
* @return
*/
@Override
public IPage<HouseRentalTenantVO> selectHouseRentalPage(IPage<HouseRentalTenantVO> page, HouseRentalTenantVO houseRental) {
- if (null!=houseRental.getAuditStatus()){
- if (houseRental.getAuditStatus()==0){
+ if (null != houseRental.getAuditStatus()) {
+ if (houseRental.getAuditStatus() == 0) {
houseRental.setAuditStatus(2);
}
}
@@ -84,19 +84,19 @@
commonParamSet.getRegionChildCodesList(),
commonParamSet.getIsAdministrator());
for (HouseRentalTenantVO houseRentalTenantVO : houseRentalTenantVOS) {
- if(houseRentalTenantVO.getStatus().equals(1)){
+ if (houseRentalTenantVO.getStatus().equals(1)) {
houseRentalTenantVO.setStatus(30);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(0)) {
houseRentalTenantVO.setStatus(0);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getAuditStatus().equals(1)) {
houseRentalTenantVO.setStatus(1);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(3)) {
houseRentalTenantVO.setStatus(20);
}
- if(houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)){
+ if (houseRentalTenantVO.getStatus().equals(0) && houseRentalTenantVO.getDldType().equals(2)) {
houseRentalTenantVO.setStatus(10);
}
}
@@ -105,6 +105,7 @@
/**
* 查询房屋出租情况
+ *
* @param code
* @return
*/
@@ -117,6 +118,7 @@
/**
* 自定义房屋出租新增
+ *
* @param houseRentalVO
* @return
*/
@@ -133,7 +135,7 @@
// 获取请求头中的角色别名
String roleName = SpringUtils.getRequestParam("roleName");
// 居民
- if (!Strings.isBlank(roleName) && roleName.equals("inhabitant")){
+ if (!Strings.isBlank(roleName) && roleName.equals("inhabitant")) {
// 待审核
houseRentalVO.setAuditStatus(0);
}
@@ -146,12 +148,13 @@
/**
* 保存租户信息
+ *
* @param houseRentalVO
* @param flag
* @return
*/
public boolean saveHousehold(HouseRentalVO houseRentalVO, boolean flag) {
- if (flag && houseRentalVO.getHouseholdVOList().size()>0) {
+ if (flag && houseRentalVO.getHouseholdVOList().size() > 0) {
List<String> phoneList = new ArrayList<>();
List<HouseholdEntity> householdEntityList = new ArrayList<>();
houseRentalVO.getHouseholdVOList().forEach(e -> {
@@ -181,13 +184,14 @@
} catch (Exception e) {
log.error("保存用户角色为居民：", e);
}
- flag = iHouseholdService.saveBatch(householdEntityList);
+ flag = iHouseholdService.saveBatch(householdEntityList);
}
return flag;
}
/**
* 出租屋 自定义删除
+ *
* @param id
* @return
*/
@@ -205,6 +209,7 @@
/**
* 出租屋 自定义修改
+ *
* @param houseRental
* @return
*/
@@ -228,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 {
@@ -254,7 +274,7 @@
e.getId()).collect(Collectors.toList()).contains(vo.getId())).collect(Collectors.toList());
// 批量新增
- if (addList.size()>0) {
+ if (addList.size() > 0) {
addFlag = iHouseholdService.saveBatch(addList);
}
// 批量修改
@@ -292,25 +312,27 @@
/**
* 获取统计数据
+ *
* @return
*/
@Override
public Object getStatistics(HouseRentalTenantVO houseRental) {
List<String> list = new ArrayList<>();
- if (null!=houseRental.getRoleName() && !houseRental.getRoleName().equals("")){
- if (houseRental.getRoleName().equals("网格员")){
+ if (null != houseRental.getRoleName() && !houseRental.getRoleName().equals("")) {
+ if (houseRental.getRoleName().equals("网格员")) {
// 查询对应的房屋地址code
list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
}
}
// 查询
- List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental,list);
+ List<HouseRentalStatistics> statistics = baseMapper.getStatistics(houseRental, list);
// 返回
return statistics;
}
/**
* 出租屋 确认
+ *
* @param houseRental
* @return
*/
@@ -324,6 +346,7 @@
/**
* 导出租赁信息
+ *
* @param houseRentalVO
* @return
*/
@@ -335,6 +358,8 @@
@Override
public Integer getStatisticsCount(HouseRentalTenantVO houseRental) {
- return baseMapper.getStatisticsCount(houseRental.getUserId(), houseRental.getNeiCode());
+ CommonParamSet<Object> commonParamSet = new CommonParamSet<>().invoke(HouseRentalTenantVO.class, houseRental);
+ return baseMapper.getStatisticsCount(houseRental, commonParamSet.getGridCodeList(),
+ commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator());
}
}
--
Gitblit v1.9.3