From 0f71799671c2143d894b31df22d99524285a8d5c Mon Sep 17 00:00:00 2001
From: xyh <18782104331@139.com>
Date: 星期五, 11 六月 2021 13:22:31 +0800
Subject: [PATCH] 实有人口、楼栋数据导入
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
index 62a9965..e1adf13 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngPopulationServiceImpl.java
@@ -7,6 +7,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
+import com.panzhihua.common.enums.PopulHouseUseEnum;
import com.panzhihua.common.enums.PopulIsOksEnum;
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.dtos.community.*;
@@ -35,6 +36,7 @@
import javax.crypto.IllegalBlockSizeException;
import javax.crypto.NoSuchPaddingException;
import java.io.UnsupportedEncodingException;
+import java.math.BigDecimal;
import java.security.InvalidKeyException;
import java.security.NoSuchAlgorithmException;
import java.util.*;
@@ -354,12 +356,22 @@
//查询该房屋未建立，执行建立房屋信息
populationHouseDO = new ComMngPopulationHouseDO();
populationHouseDO.setVillageId(comMngVillageDO.getVillageId());
+ populationHouseDO.setAlley(vo.getRoad());
+ populationHouseDO.setHouseNum(vo.getDoorNo());
+ populationHouseDO.setCode(vo.getDoorNo());
+ populationHouseDO.setStatus(vo.getIsRent());
populationHouseDO.setCommunityId(communityId);
populationHouseDO.setFloor(vo.getFloor());
populationHouseDO.setUnitNo(vo.getUnitNo());
populationHouseDO.setHouseNo(vo.getHouseNo());
populationHouseDO.setAddress(address);
populationHouseDO.setUpdateAt(new Date());
+ populationHouseDO.setConstructPurpose(vo.getBuildPurpose());
+ try {
+ populationHouseDO.setConstructArea(new BigDecimal(vo.getBuildArea()));
+ }catch (Exception e){
+ }
+
if(StringUtils.isEmpty(vo.getName()) && StringUtils.isEmpty(vo.getCardNo())){
populationHouseDO.setIsEmpty(PopulIsOksEnum.YES.getCode());
}
@@ -445,7 +457,7 @@
}
}else {
//实有人口已存在，判断录入的这个房屋信息是否是用户的居住地
- if(vo.getIsResidence() != null && vo.getIsResidence().equals(PopulIsOksEnum.YES.getCode())){
+ if(vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())){
populationDO.setRoad(vo.getRoad());
populationDO.setDoorNo(vo.getDoorNo());
populationDO.setFloor(vo.getFloor());
--
Gitblit v1.7.1