From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 101 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 82 insertions(+), 19 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 905645a..ef25572 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
@@ -29,14 +29,17 @@
import org.springblade.common.param.CommonParamSet;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.common.utils.SpringUtils;
-import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.house.entity.HouseRentalEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
+import org.springblade.modules.house.excel.ExportHouseholdExcel;
+import org.springblade.modules.house.excel.HouseTenantExcel;
import org.springblade.modules.house.excel.ImportHouseholdExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
+import org.springblade.modules.house.service.IHouseRentalService;
import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.service.IUserHouseLabelService;
@@ -81,6 +84,10 @@
@Autowired
private IPlaceService placeService;
+
+ @Autowired
+ private IHouseRentalService iHouseRentalService;
+
@Override
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -300,21 +307,36 @@
return baseMapper.getHouseholdListById(household);
}
+ /**
+ * 导出住户信息
+ * @param household
+ * @return
+ */
@Override
- public List<ImportHouseholdExcel> export(HouseholdVO household) {
- List<ImportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household);
+ public List<ExportHouseholdExcel> export(HouseholdVO household) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
+ // 重点人员与关注人员
+ if (Objects.nonNull(household.getLabelType())) {
+ extracted(household);
+ }
+ List<ExportHouseholdExcel> userHouseHoldExcels = baseMapper.export(household,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList()
+ );
return userHouseHoldExcels;
}
/**
* 导入住户数据
+ *
* @param data
* @param isCovered
*/
@Override
@Transactional(rollbackFor = Exception.class)
- public String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered) {
+ public String importUserHouseHold(List<ImportHouseholdExcel> data, Boolean isCovered, String isTenant) {
IHouseService houseService = SpringUtils.getBean(IHouseService.class);
int totalNum = data.size();
int importNum = 0;
@@ -323,23 +345,48 @@
for (ImportHouseholdExcel houseHoldExcel : data) {
HouseholdEntity householdEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, HouseholdEntity.class));
// 判断姓名，手机号
- if (Strings.isBlank(householdEntity.getName()) || Strings.isBlank(householdEntity.getPhoneNumber())){
- errorNum ++;
+ if (Strings.isBlank(householdEntity.getName())
+ || Strings.isBlank(householdEntity.getHouseCode())
+ ) {
+ errorNum++;
continue;
}
// 查询库中是否已存在
QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
wrapper.eq("house_code", householdEntity.getHouseCode())
.eq("is_deleted", 0)
- .eq("phone_number", householdEntity.getPhoneNumber())
.eq("name", householdEntity.getName());
- HouseholdEntity one = this.getOne(wrapper);
+ List<HouseholdEntity> list = this.list(wrapper);
// 与角色关系
if (!Strings.isBlank(houseHoldExcel.getRelationship())) {
householdEntity.setRelationship(Integer.parseInt(houseHoldExcel.getRelationship()));
// 如果是业主，则需要往用户表插入用户
if (householdEntity.getRelationship() == 1) {
houseService.saveOrUpdateUser(householdEntity);
+ }
+ }
+ // 判断是否租户导入
+ if (StringUtils.isNotBlank(isTenant)) {
+ householdEntity.setRelationship(18);
+ HouseRentalEntity houseRentalEntity = iHouseRentalService.getOne(Wrappers.<HouseRentalEntity>lambdaQuery()
+ .eq(HouseRentalEntity::getHouseCode, householdEntity.getHouseCode()));
+ if (houseRentalEntity != null) {
+ householdEntity.setHousingRentalId(houseRentalEntity.getId());
+ } else {
+ // 新建出租屋
+ HouseRentalEntity houseRentalEntity1 = new HouseRentalEntity();
+ houseRentalEntity1.setHouseCode(householdEntity.getHouseCode());
+ houseRentalEntity1.setHouseStatus(1);
+ houseRentalEntity1.setAuditStatus(0);
+ houseRentalEntity1.setRentalUse(4);
+ houseRentalEntity1.setTenantRelationship(1);
+ houseRentalEntity1.setRentalTime(new Date());
+ houseRentalEntity1.setDueTime(new Date());
+ houseRentalEntity1.setTerminationTime(new Date());
+ iHouseRentalService.save(houseRentalEntity1);
+ householdEntity.setHousingRentalId(houseRentalEntity1.getId());
+ // errorNum++;
+ // continue;
}
}
/// 是否主要联系人
@@ -395,7 +442,7 @@
householdEntity.setMaritalStatus(Integer.parseInt(houseHoldExcel.getMaritalStatus()));
}
- if (one==null){
+ if (list.size()==0){
// 新增
this.save(householdEntity);
importNum++;
@@ -404,22 +451,26 @@
}else {
updateNum++;
if (isCovered){
- // 覆盖更新
- householdEntity.setId(one.getId());
- // 更新
- updateById(householdEntity);
+ for (HouseholdEntity one : list) {
+ // 覆盖更新
+ householdEntity.setId(one.getId());
+ // 更新
+ updateById(householdEntity);
+ // 处理标签
+ handleLabel(householdEntity,houseHoldExcel);
+ }
importNum++;
- // 处理标签
- handleLabel(householdEntity,houseHoldExcel);
}
}
}
StringBuilder builder = new StringBuilder("导入完成!");
builder.append("其中本次表格共有 ").append(totalNum).append(" 条数据，")
- .append("成功导入 ").append(importNum).append(" 条数据，")
- .append("其中有 ").append(updateNum).append(" 条数据已存在。");
+ .append("成功导入 ").append(importNum).append(" 条数据。");
+ if (updateNum>0) {
+ builder.append("其中有 ").append(updateNum).append(" 条数据已存在。");
+ }
if (errorNum>0){
- builder.append("共有 ").append(errorNum).append(" 条数据由于无姓名或手机号信息未导入!");
+ builder.append("共有 ").append(errorNum).append(" 条数据由于无姓名或门牌地址编码信息未导入!");
}
return builder.toString();
}
@@ -742,12 +793,24 @@
/**
* 查询对应的住户集合
+ *
* @param i
* @param size
* @return
*/
@Override
public List<HouseholdVO> getAllList(int i, int size) {
- return baseMapper.getAllList(i,size);
+ return baseMapper.getAllList(i, size);
+ }
+
+ @Override
+ public List<HouseTenantExcel> exportTenant(HouseholdVO household) {
+ CommonParamSet commonParamSet = new CommonParamSet().invoke(HouseholdVO.class, household);
+ List<HouseTenantExcel> houseTenantExcels = baseMapper.exportTenant(household,
+ commonParamSet.getIsAdministrator(),
+ commonParamSet.getRegionChildCodesList(),
+ commonParamSet.getGridCodeList()
+ );
+ return houseTenantExcels;
}
}
--
Gitblit v1.9.3