From 1c8fc3df880a10625fe8326af8d6442d8f90f398 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 09 Dec 2023 13:29:18 +0800
Subject: [PATCH] 出租人员信息完善
---
src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java | 71 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
index dc5174f..f3ee606 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseServiceImpl.java
@@ -17,8 +17,10 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.utils.IdUtils;
import org.springblade.common.utils.NodeTreeUtil;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
@@ -26,21 +28,18 @@
import org.springblade.modules.house.entity.HouseEntity;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseAndHoldExcel;
+import org.springblade.modules.house.excel.HouseExcel;
+import org.springblade.modules.house.mapper.HouseMapper;
+import org.springblade.modules.house.service.IHouseService;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseParam;
import org.springblade.modules.house.vo.HouseTree;
import org.springblade.modules.house.vo.HouseVO;
-import org.springblade.modules.house.mapper.HouseMapper;
-import org.springblade.modules.house.service.IHouseService;
-import org.springblade.modules.house.excel.HouseExcel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Objects;
+import java.util.*;
/**
* 房屋 服务实现类
@@ -147,9 +146,10 @@
* @param isCovered
*/
@Override
+ @Transactional(rollbackFor = Exception.class)
public void importHouseAndHold(List<HouseAndHoldExcel> data, Boolean isCovered) {
for (HouseAndHoldExcel houseAndHoldExcel : data) {
- System.out.println("houseAndHoldExcel = " + houseAndHoldExcel);
+// System.out.println("houseAndHoldExcel = " + houseAndHoldExcel);
// 保存房屋数据--一个一个插入，防止一个表格中存在多个地址编号相同的数据
saveHouseData(houseAndHoldExcel);
// 保存住户数据（包含标签）--一个一个插入，防止一个表格中存在多个地址编号相同的数据
@@ -162,7 +162,8 @@
* 保存房屋数据
* @param houseAndHoldExcel
*/
- private void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
+ @Transactional(rollbackFor = Exception.class)
+ public void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
// 查询库中是否已存在
QueryWrapper<HouseEntity> wrapper = new QueryWrapper<>();
wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
@@ -175,7 +176,9 @@
houseEntity.setHouseName(houseAndHoldExcel.getHouseName());
houseEntity.setDistrictName(houseAndHoldExcel.getDistrictName());
houseEntity.setUnit(houseAndHoldExcel.getUnit());
- houseEntity.setFloor(houseAndHoldExcel.getFloor());
+ if (!Strings.isBlank(houseAndHoldExcel.getFloor())){
+ houseEntity.setFloor(houseAndHoldExcel.getFloor());
+ }
houseEntity.setRoom(houseAndHoldExcel.getRoom());
houseEntity.setBuilding(houseAndHoldExcel.getBuilding());
houseEntity.setArea(houseAndHoldExcel.getArea());
@@ -186,6 +189,12 @@
houseEntity.setCreateUser(AuthUtil.getUserId().toString());
houseEntity.setUpdateTime(new Date());
houseEntity.setUpdateUser(AuthUtil.getUserId().toString());
+ if (!Strings.isBlank(houseAndHoldExcel.getHouseCode())) {
+ houseEntity.setSource(1);
+ }else {
+ houseEntity.setHouseCode(IdUtils.getIdBy36());
+ houseEntity.setSource(2);
+ }
// 新增
save(houseEntity);
}
@@ -195,7 +204,8 @@
* 保存住户数据
* @param houseAndHoldExcel
*/
- private void saveHouseData(HouseAndHoldExcel houseAndHoldExcel) {
+ @Transactional(rollbackFor = Exception.class)
+ public void saveHouseholdData(HouseAndHoldExcel houseAndHoldExcel) {
// 查询库中是否已存在
QueryWrapper<HouseholdEntity> wrapper = new QueryWrapper<>();
wrapper.eq("house_code",houseAndHoldExcel.getHouseCode())
@@ -217,10 +227,19 @@
if (!Strings.isBlank(houseAndHoldExcel.getIsPrimaryContact())){
householdEntity.setIsPrimaryContact(Integer.parseInt(houseAndHoldExcel.getIsPrimaryContact()));
}
+ // 居住状态
if (!Strings.isBlank(houseAndHoldExcel.getResidentialStatus())){
householdEntity.setResidentialStatus(Integer.parseInt(houseAndHoldExcel.getResidentialStatus()));
}
+ // 性别
+ if (!Strings.isBlank(houseAndHoldExcel.getGender())){
+ householdEntity.setGender(Short.parseShort(houseAndHoldExcel.getGender()));
+ }
householdEntity.setIdCard(houseAndHoldExcel.getIdCard());
+ // 党员
+ if (!Strings.isBlank(houseAndHoldExcel.getPartyEmber())){
+ householdEntity.setPartyEmber(Integer.parseInt(houseAndHoldExcel.getPartyEmber()));
+ }
householdEntity.setHkmtPass(houseAndHoldExcel.getHkmtPass());
householdEntity.setPassport(houseAndHoldExcel.getPassport());
if (!Strings.isBlank(houseAndHoldExcel.getEthnicity())){
@@ -238,6 +257,8 @@
householdEntity.setMaritalStatus(Integer.parseInt(houseAndHoldExcel.getMaritalStatus()));
}
householdEntity.setCardNumber(houseAndHoldExcel.getCardNumber());
+ householdEntity.setOtherContact(houseAndHoldExcel.getOtherContact());
+ householdEntity.setDisabilityCert(houseAndHoldExcel.getDisabilityCert());
householdEntity.setRemark(houseAndHoldExcel.getRemarks());
householdEntity.setCreateTime(new Date());
householdEntity.setCreateUser(AuthUtil.getUserId());
@@ -247,4 +268,30 @@
householdService.save(householdEntity);
}
}
+
+ @Override
+ public Map<String, Object> getHouseStatistics(String code, String roleType) {
+ Map<String, Object> objectObjectHashMap = new HashMap<>();
+ if (roleType.equals("1")) {
+ // result1 查询楼栋数 result2 查询房屋套数 result3 查询住户数 result4 查询单元数
+ Integer result1 = baseMapper.getHouseStatisticsOne(code, AuthUtil.getUserId());
+ Integer result2 = baseMapper.getHouseStatisticsTwo(code, AuthUtil.getUserId());
+ Integer result3 = baseMapper.getHouseStatisticsThree(code, AuthUtil.getUserId());
+ Integer result4 = baseMapper.getHouseStatisticsFour(code, AuthUtil.getUserId());
+ objectObjectHashMap.put("result1", result1);
+ objectObjectHashMap.put("result2", result2);
+ objectObjectHashMap.put("result3", result3);
+ objectObjectHashMap.put("result4", result4);
+ } else {
+ Integer result1 = baseMapper.getHouseStatisticsOne(code, null);
+ Integer result2 = baseMapper.getHouseStatisticsTwo(code, null);
+ Integer result3 = baseMapper.getHouseStatisticsThree(code, null);
+ Integer result4 = baseMapper.getHouseStatisticsFour(code, null);
+ objectObjectHashMap.put("result1", result1);
+ objectObjectHashMap.put("result2", result2);
+ objectObjectHashMap.put("result3", result3);
+ objectObjectHashMap.put("result4", result4);
+ }
+ return objectObjectHashMap;
+ }
}
--
Gitblit v1.9.3