From a2003a70a609a1d80e7b25b901a7bf059dccb906 Mon Sep 17 00:00:00 2001
From: songyunpeng <syp2850@163.com>
Date: Tue, 15 Sep 2020 09:52:23 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=BF=E5=B1=8B=E4=BF=A1=E6=81=AF=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F-=E5=8E=BB=E6=8E=89=E5=A4=A7=E9=87=8F=E5=BF=85?=
 =?UTF-8?q?=E5=A1=AB=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/HousingInformationServiceImpl.java   | 335 ++++++------------
 .../excel/居民信息录入模板.xls        | Bin 43520 -> 36352 bytes
 2 files changed, 100 insertions(+), 235 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java
index b66d8e12..6d8725e6 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/HousingInformationServiceImpl.java
@@ -26,7 +26,10 @@ import com.elink.esua.epdc.commons.mybatis.service.impl.BaseServiceImpl;
 import com.elink.esua.epdc.commons.tools.constant.FieldConstant;
 import com.elink.esua.epdc.commons.tools.exception.RenException;
 import com.elink.esua.epdc.commons.tools.page.PageData;
-import com.elink.esua.epdc.commons.tools.utils.*;
+import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
+import com.elink.esua.epdc.commons.tools.utils.ExcelUtils;
+import com.elink.esua.epdc.commons.tools.utils.IdentityNoUtils;
+import com.elink.esua.epdc.commons.tools.utils.Result;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.constant.HouseUseConstant;
 import com.elink.esua.epdc.constant.PopulationDictConstant;
@@ -51,7 +54,6 @@ import org.springframework.web.multipart.MultipartFile;
 import java.io.File;
 import java.math.BigDecimal;
 import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * 房屋信息表
@@ -140,14 +142,16 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }
         }
         if (HouseUseConstant.RENT.equals(dto.getHouseUse())) {
-            //判断身份证是否合法
-            String result = IdentityNoUtils.IdentityNoVerification(dto.getTenantIdentityNo());
-            if (result != null) {
-                return new Result().error("承租人人身份证不合法:"+result);
+            if (StringUtils.isNotBlank(dto.getTenantIdentityNo())) {
+                //判断身份证是否合法
+                String result = IdentityNoUtils.IdentityNoVerification(dto.getTenantIdentityNo());
+                if (result != null) {
+                    return new Result().error("承租人人身份证不合法:"+result);
+                }
             }
+
         }
         HousingInformationEntity entity = ConvertUtils.sourceToTarget(dto, HousingInformationEntity.class);
-
         //赋值部门信息
         setDept(entity);
         insert(entity);
@@ -167,11 +171,14 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }
         }
         if (HouseUseConstant.RENT.equals(dto.getHouseUse())) {
-            //判断身份证是否合法
-            String result = IdentityNoUtils.IdentityNoVerification(dto.getTenantIdentityNo());
-            if (result != null) {
-                return new Result().error("承租人人身份证不合法:"+result);
+            if (StringUtils.isNotBlank(dto.getTenantIdentityNo())) {
+                //判断身份证是否合法
+                String result = IdentityNoUtils.IdentityNoVerification(dto.getTenantIdentityNo());
+                if (result != null) {
+                    return new Result().error("承租人人身份证不合法:"+result);
+                }
             }
+
         }
         HousingInformationEntity entity = ConvertUtils.sourceToTarget(dto, HousingInformationEntity.class);
         //赋值部门信息
@@ -365,7 +372,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 return new Result().ok(epdcResidentErrorResultDTOS);
             }
             if(basePopulationInformationExcels!=null && basePopulationInformationExcels.size()>0){
-                populationIdNoAndIdMap = savePopulationList(basePopulationInformationExcels, parentAndAllDeptDTO);
+                populationIdNoAndIdMap = savePopulationListEnd(basePopulationInformationExcels, parentAndAllDeptDTO);
             }
             if(baseResidentInformationExcels!=null && baseResidentInformationExcels.size()>0){
                 saveResidentList(baseResidentInformationExcels,populationIdNoAndIdMap);
@@ -420,14 +427,69 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
         }
 
     }
-
     /**
+     * @Description  校验完成后新增人口信息
+     * @Author songyunpeng
+     * @Date  2020/8/31
+     * @Param [basePopulationInformationExcels]
      * @return void
-     * @Description 校验完成后新增人口信息
+     **/
+    private Map<String,String> savePopulationListEnd(List<BasePopulationInformationExcel> basePopulationInformationExcels,ParentAndAllDeptDTO parentAndAllDeptDTO) {
+        Map<String,String> populationIdNoAndIdMap = new HashMap<>();
+        for (BasePopulationInformationExcel basePopulationInformationExcel : basePopulationInformationExcels) {
+            //插入房屋信息
+            HousingInformationEntity housingInformationEntity = ConvertUtils.sourceToTarget(basePopulationInformationExcel,HousingInformationEntity.class);
+            if(basePopulationInformationExcel.getBuyingTime()!=null){
+                housingInformationEntity.setBuyingTime(DateUtil.parse(basePopulationInformationExcel.getBuyingTime()));
+            }
+            housingInformationEntity.setGridId(parentAndAllDeptDTO.getGridId());
+            housingInformationEntity.setAllDeptNames(parentAndAllDeptDTO.getAllDeptNames());
+            housingInformationEntity.setAllDeptIds(parentAndAllDeptDTO.getAllDeptIds());
+            housingInformationEntity.setParentDeptNames(parentAndAllDeptDTO.getParentDeptNames());
+            housingInformationEntity.setParentDeptIds(parentAndAllDeptDTO.getParentDeptIds());
+            baseDao.insert(housingInformationEntity);
+            if(HouseUseConstant.RENT.equals(housingInformationEntity.getHouseUse())){
+                //房屋租赁信息
+                HouseRentInfoEntity houseRentInfoEntity = ConvertUtils.sourceToTarget(basePopulationInformationExcel,HouseRentInfoEntity.class);
+                houseRentInfoEntity.setHouseId(housingInformationEntity.getId());
+                houseRentInfoService.insert(houseRentInfoEntity);
+            }else if(HouseUseConstant.BUSINESS.equals(housingInformationEntity.getHouseUse())){
+                //房屋经营信息
+                HouseBusinessInfoEntity houseBusinessInfoEntity = ConvertUtils.sourceToTarget(basePopulationInformationExcel,HouseBusinessInfoEntity.class);
+                houseBusinessInfoEntity.setHouseId(housingInformationEntity.getId());
+                houseBusinessInfoService.insert(houseBusinessInfoEntity);
+            }
+            //插入户主信息
+            PopulationInformationEntity populationInformationEntity = ConvertUtils.sourceToTarget(basePopulationInformationExcel,PopulationInformationEntity.class);
+            PopulationInformationEntity oldPopulationInformationEntity= populationInformationService.getInfoByIdentityNo(populationInformationEntity.getResidentsIdentityNo());
+            //校验户主信息
+            validateHouseHeadInfo(populationInformationEntity,basePopulationInformationExcel);
+            if(oldPopulationInformationEntity!=null){
+                //身份证在列表已存在，则更新户主信息
+                populationInformationEntity.setId(oldPopulationInformationEntity.getId());
+                populationInformationService.updateById(populationInformationEntity);
+            }else {
+                //校验户主信息
+                populationInformationService.insert(populationInformationEntity);
+            }
+            //插入房屋人员关联关系表
+            HouseResidentEntity houseResidentEntity = new HouseResidentEntity();
+            houseResidentEntity.setHouseId(housingInformationEntity.getId());
+            houseResidentEntity.setResidentId(populationInformationEntity.getId());
+            houseResidentEntity.setIsHouseHead("1");
+            houseResidentDao.insert(houseResidentEntity);
+            populationIdNoAndIdMap.put(basePopulationInformationExcel.getResidentsIdentityNo(),populationInformationEntity.getId());
+        }
+        return populationIdNoAndIdMap;
+    }
+    /**
+     * @return void
+     * @Description 校验完成后新增人口信息  -  因为不填写产权证而废弃
      * @Author songyunpeng
      * @Date 2020/8/31
      * @Param [basePopulationInformationExcels]
      **/
+    @Deprecated
     private Map<String,String> savePopulationList(List<BasePopulationInformationExcel> basePopulationInformationExcels, ParentAndAllDeptDTO parentAndAllDeptDTO) {
         //插入房屋信息
         List<HousingInformationEntity> housingInformationEntityList = new ArrayList<>();
@@ -556,6 +618,8 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
         return populationIdNoAndIdMap;
     }
 
+
+
     /**
      * @return void
      * @Description 校验excel新增时户主的一些信息
@@ -605,7 +669,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }
         }
 
-        if(basePopulationInformationExcel.getMotorVehicleNum()==0){
+        if(basePopulationInformationExcel.getMotorVehicleNum()!=null && basePopulationInformationExcel.getMotorVehicleNum()==0){
             //如果机动车数量为0 清空机动车类型
             populationInformationEntity.setMotorVehicleCategory("");
         }
@@ -732,11 +796,9 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
      * @Param [basePopulationInformationExcels, populationInformationDTOS]
      **/
     private List<EpdcPopulationErrorResultDTO> checkPopulationExcel(List<BasePopulationInformationExcel> basePopulationInformationExcels, List<SysPopulationSimpleDictDTO> sysPopulationSimpleDictDTOS) {
-        List<HousingInformationDTO> housingInformationDTOS = list(new HashMap<>());
         // 不匹配信息
         List<EpdcPopulationErrorResultDTO> errorLineInfoList = new ArrayList<>();
         EpdcPopulationErrorResultDTO errorLineInfoDto;
-        Map<String, String> isPropertyOwnerCard = new ConcurrentHashMap<>();
         for (int i = 0; i < basePopulationInformationExcels.size(); i++) {
             BasePopulationInformationExcel basePopulationInformationExcel = basePopulationInformationExcels.get(i);
             String houseAddress = basePopulationInformationExcel.getHouseAddress()==null?null:basePopulationInformationExcel.getHouseAddress().trim();
@@ -745,7 +807,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             String propertyOwner = basePopulationInformationExcel.getPropertyOwner()==null?null:basePopulationInformationExcel.getPropertyOwner().trim();
             String propertyOwnerIdentityNo = basePopulationInformationExcel.getPropertyOwnerIdentityNo()==null?null:basePopulationInformationExcel.getPropertyOwnerIdentityNo().trim();
             String propertyOwnerMobile = basePopulationInformationExcel.getPropertyOwnerMobile()==null?null:basePopulationInformationExcel.getPropertyOwnerMobile().trim();
-            String propertyOwnerCard = basePopulationInformationExcel.getPropertyOwnerCard()==null?null:basePopulationInformationExcel.getPropertyOwnerCard().trim();
             String houseUse = basePopulationInformationExcel.getHouseUse()==null?null:basePopulationInformationExcel.getHouseUse().trim();
             String tenantName = basePopulationInformationExcel.getTenantName()==null?null:basePopulationInformationExcel.getTenantName().trim();
             String tenantIdentityNo = basePopulationInformationExcel.getTenantIdentityNo()==null?null:basePopulationInformationExcel.getTenantIdentityNo().trim();
@@ -788,13 +849,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }else if(StringUtils.isNotBlank((houseAddress))){
                 basePopulationInformationExcel.setHouseAddress(houseAddress);
             }
-            if (StringUtils.isBlank(buyingTime)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("购房时间为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(buyingTime)) {
+             if (StringUtils.isNotBlank(buyingTime)) {
                 if (!IdentityNoUtils.isStrDate(buyingTime)) {
                     errorLineInfoDto = new EpdcPopulationErrorResultDTO();
                     errorLineInfoDto.setErrorLine((i + 2) + "");
@@ -811,14 +866,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     }
                 }
                 basePopulationInformationExcel.setBuyingTime(buyingTime);
-
-            }
-            if (houseArea == null) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("房屋面积为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
             }
             if (StringUtils.isBlank(propertyOwner)) {
                 errorLineInfoDto = new EpdcPopulationErrorResultDTO();
@@ -847,33 +894,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }else if(StringUtils.isNotBlank((propertyOwnerMobile))){
                 basePopulationInformationExcel.setPropertyOwnerMobile(propertyOwnerMobile);
             }
-            if (StringUtils.isBlank(propertyOwnerCard)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("产权证为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(propertyOwnerCard)) {
-                for (HousingInformationDTO housingInformationDTO : housingInformationDTOS) {
-                    if (housingInformationDTO.getPropertyOwnerCard().equals(propertyOwnerCard)) {
-                        errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                        errorLineInfoDto.setErrorLine((i + 2) + "");
-                        errorLineInfoDto.setErrorInfo("产权证已存在");
-                        errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                        errorLineInfoList.add(errorLineInfoDto);
-                    }
-                }
-                if (isPropertyOwnerCard.containsKey(propertyOwnerCard)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("产权证在EXCEL已存在");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }
-                isPropertyOwnerCard.put(propertyOwnerCard, (i + 2) + "");
-                basePopulationInformationExcel.setPropertyOwnerCard(propertyOwnerCard);
-            }
-
             if (StringUtils.isBlank(houseUse)) {
                 errorLineInfoDto = new EpdcPopulationErrorResultDTO();
                 errorLineInfoDto.setErrorLine((i + 2) + "");
@@ -929,22 +949,10 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
 
                 }
             } else if (HouseUseConstant.BUSINESS.equals(houseUse)) {
-                if (StringUtils.isBlank(enterpriseName)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("企业名称为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((enterpriseName))){
+                if(StringUtils.isNotBlank((enterpriseName))){
                     basePopulationInformationExcel.setEnterpriseName(enterpriseName);
                 }
-                if (StringUtils.isBlank(legalRepresentative)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("法人为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((legalRepresentative))){
+               if(StringUtils.isNotBlank((legalRepresentative))){
                     basePopulationInformationExcel.setLegalRepresentative(legalRepresentative);
                 }
                 if (StringUtils.isBlank(enterprisePhone)) {
@@ -956,13 +964,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 }else if(StringUtils.isNotBlank((enterprisePhone))){
                     basePopulationInformationExcel.setEnterprisePhone(enterprisePhone);
                 }
-                if (StringUtils.isBlank(socialUniformCode)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("社会统一代码为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((socialUniformCode))){
+                if(StringUtils.isNotBlank((socialUniformCode))){
                     basePopulationInformationExcel.setSocialUniformCode(socialUniformCode);
                 }
             }
@@ -975,22 +977,9 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }else if(StringUtils.isNotBlank((residentsName))){
                 basePopulationInformationExcel.setResidentsName(residentsName);
             }
-            if (StringUtils.isBlank(residentsNation)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("民族为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }else if(StringUtils.isNotBlank((residentsNation))){
+           if(StringUtils.isNotBlank((residentsNation))){
                 basePopulationInformationExcel.setResidentsNation(residentsNation);
             }
-            if (StringUtils.isBlank(educationLevel)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("文化程度为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }
             if (StringUtils.isNotBlank(educationLevel)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
@@ -1012,13 +1001,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoList.add(errorLineInfoDto);
                 }
             }
-            if (StringUtils.isBlank(politicsStatus)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("政治面貌为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }
             if (StringUtils.isNotBlank(politicsStatus)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
@@ -1041,13 +1023,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 }
             }
             if ("党员".equals(politicsStatus)) {
-                if (StringUtils.isBlank(joinTime)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("入党时间为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                } else if (StringUtils.isNotBlank(joinTime)) {
+               if (StringUtils.isNotBlank(joinTime)) {
                     if (!IdentityNoUtils.isStrDate(joinTime)) {
                         errorLineInfoDto = new EpdcPopulationErrorResultDTO();
                         errorLineInfoDto.setErrorLine((i + 2) + "");
@@ -1065,13 +1041,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     }
                     basePopulationInformationExcel.setJoinTime(joinTime);
                 }
-                if (StringUtils.isBlank(organizationalRelationshipLocation)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("组织关系所在地为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((organizationalRelationshipLocation))){
+               if(StringUtils.isNotBlank((organizationalRelationshipLocation))){
                     basePopulationInformationExcel.setOrganizationalRelationshipLocation(organizationalRelationshipLocation);
                 }
             }
@@ -1105,13 +1075,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
             }else if(StringUtils.isNotBlank((residentsPhone))){
                 basePopulationInformationExcel.setResidentsPhone(residentsPhone);
             }
-            if (StringUtils.isBlank(bodyStatus)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主身体状况为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }
             if (StringUtils.isNotBlank(bodyStatus)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
@@ -1133,13 +1096,6 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoList.add(errorLineInfoDto);
                 }
             }
-            if (StringUtils.isBlank(maritalStatus)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主婚姻状况为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }
             if (StringUtils.isNotBlank(maritalStatus)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
@@ -1162,13 +1118,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 }
 
             }
-            if (StringUtils.isBlank(accountType)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主户口类型为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(accountType)) {
+           if (StringUtils.isNotBlank(accountType)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
                     if (PopulationDictConstant.ACCOUNT_TYPE.equals(sysPopulationSimpleDictDTO.getDicType())) {
@@ -1190,13 +1140,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 }
 
             }
-            if (StringUtils.isBlank(militaryService)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主是否服兵役为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }else if(StringUtils.isNotBlank((militaryService))){
+           if(StringUtils.isNotBlank((militaryService))){
                 basePopulationInformationExcel.setMilitaryService(militaryService);
             }
             if (StringUtils.isNotBlank(militaryService) && !"0".equals(militaryService) && !"1".equals(militaryService)) {
@@ -1206,22 +1150,10 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 errorLineInfoDto.setSheetName("房屋信息和户主信息");
                 errorLineInfoList.add(errorLineInfoDto);
             }
-            if (StringUtils.isBlank(householdRegistrationPlace)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主户籍地为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }else if(StringUtils.isNotBlank((householdRegistrationPlace))){
+           if(StringUtils.isNotBlank((householdRegistrationPlace))){
                 basePopulationInformationExcel.setHouseholdRegistrationPlace(householdRegistrationPlace);
             }
-            if (StringUtils.isBlank(employmentStatus)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主是否就业为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(employmentStatus)) {
+            if (StringUtils.isNotBlank(employmentStatus)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
                     if (PopulationDictConstant.EMPLOYMENT_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
@@ -1243,32 +1175,14 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 }
             }
             if ("在岗".equals(employmentStatus)) {
-                if (StringUtils.isBlank(currentEmployer)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("户主现工作单位为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((currentEmployer))){
+               if(StringUtils.isNotBlank((currentEmployer))){
                     basePopulationInformationExcel.setCurrentEmployer(currentEmployer);
                 }
-                if (StringUtils.isBlank(currentEmployerAddress)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("户主现单位地址为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((currentEmployerAddress))){
+                 if(StringUtils.isNotBlank((currentEmployerAddress))){
                     basePopulationInformationExcel.setCurrentEmployerAddress(currentEmployerAddress);
                 }
             } else if ("失业".equals(employmentStatus)) {
-                if (StringUtils.isBlank(unemploymentReason)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("户主失业原因为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                } else if (StringUtils.isNotBlank(unemploymentReason)) {
+                if (StringUtils.isNotBlank(unemploymentReason)) {
                     boolean isMatch = false;
                     for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
                         if (PopulationDictConstant.UNEMPLOYMENT_REASON.equals(sysPopulationSimpleDictDTO.getDicType())) {
@@ -1289,13 +1203,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                         errorLineInfoList.add(errorLineInfoDto);
                     }
                 }
-                if (StringUtils.isBlank(reemploymentPermit)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("户主是否有再就业优惠证为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((reemploymentPermit))){
+                if(StringUtils.isNotBlank((reemploymentPermit))){
                     basePopulationInformationExcel.setReemploymentPermit(reemploymentPermit);
                 }
                 if (StringUtils.isNotBlank(reemploymentPermit) && !"0".equals(reemploymentPermit) && !"1".equals(reemploymentPermit)) {
@@ -1305,13 +1213,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoDto.setSheetName("房屋信息和户主信息");
                     errorLineInfoList.add(errorLineInfoDto);
                 }
-                if (StringUtils.isBlank(unemploymentRegister)) {
-                    errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                    errorLineInfoDto.setErrorLine((i + 2) + "");
-                    errorLineInfoDto.setErrorInfo("户主是否失业登记为空");
-                    errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                    errorLineInfoList.add(errorLineInfoDto);
-                }else if(StringUtils.isNotBlank((unemploymentRegister))){
+               if(StringUtils.isNotBlank((unemploymentRegister))){
                     basePopulationInformationExcel.setUnemploymentRegister(unemploymentRegister);
                 }
                 if (StringUtils.isNotBlank(unemploymentRegister) && !"0".equals(unemploymentRegister) && !"1".equals(unemploymentRegister)) {
@@ -1322,13 +1224,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoList.add(errorLineInfoDto);
                 }
                 if(StringUtils.isNotBlank(unemploymentRegister) && "1".equals(unemploymentRegister)){
-                    if (StringUtils.isBlank(unemploymentRegisterTime)) {
-                        errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                        errorLineInfoDto.setErrorLine((i + 2) + "");
-                        errorLineInfoDto.setErrorInfo("户主失业登记时间为空");
-                        errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                        errorLineInfoList.add(errorLineInfoDto);
-                    } else if (StringUtils.isNotBlank(unemploymentRegisterTime)) {
+                     if (StringUtils.isNotBlank(unemploymentRegisterTime)) {
                         if (!IdentityNoUtils.isStrDate(unemploymentRegisterTime)) {
                             errorLineInfoDto = new EpdcPopulationErrorResultDTO();
                             errorLineInfoDto.setErrorLine((i + 2) + "");
@@ -1348,13 +1244,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     }
                 }
             }
-            if (StringUtils.isBlank(familyCategory)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主家庭类别为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(familyCategory)) {
+             if (StringUtils.isNotBlank(familyCategory)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
                     if (PopulationDictConstant.FAMILY_CATEGORY.equals(sysPopulationSimpleDictDTO.getDicType())) {
@@ -1375,13 +1265,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoList.add(errorLineInfoDto);
                 }
             }
-            if (StringUtils.isBlank(helpStatus)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("户主家庭救助情况为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(helpStatus)) {
+           if (StringUtils.isNotBlank(helpStatus)) {
                 boolean isMatch = false;
                 for (SysPopulationSimpleDictDTO sysPopulationSimpleDictDTO : sysPopulationSimpleDictDTOS) {
                     if (PopulationDictConstant.HELP_STATUS.equals(sysPopulationSimpleDictDTO.getDicType())) {
@@ -1403,20 +1287,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                     errorLineInfoList.add(errorLineInfoDto);
                 }
             }
-            if (motorVehicleNum == null) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("机动车台数为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }
-            if (motorVehicleNum != null && motorVehicleNum.intValue() > 0 && StringUtils.isBlank(motorVehicleCategory)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("机动车类型为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            } else if (StringUtils.isNotBlank(motorVehicleCategory)) {
+            if (StringUtils.isNotBlank(motorVehicleCategory)) {
                 //处理多选类型
                 String[] motorVehicleCategoryStrings = motorVehicleCategory.split(",");
                 Integer matchNum = 0;
@@ -1443,13 +1314,7 @@ public class HousingInformationServiceImpl extends BaseServiceImpl<HousingInform
                 }
                 basePopulationInformationExcel.setMotorVehicleCategory(motorVehicleCategoryEnd.substring(0,motorVehicleCategoryEnd.lastIndexOf(",")));
             }
-            if (StringUtils.isBlank(dogStatus)) {
-                errorLineInfoDto = new EpdcPopulationErrorResultDTO();
-                errorLineInfoDto.setErrorLine((i + 2) + "");
-                errorLineInfoDto.setErrorInfo("宠物犬情况为空");
-                errorLineInfoDto.setSheetName("房屋信息和户主信息");
-                errorLineInfoList.add(errorLineInfoDto);
-            }else if(StringUtils.isNotBlank(dogStatus)){
+            if(StringUtils.isNotBlank(dogStatus)){
                 basePopulationInformationExcel.setDogStatus(dogStatus);
             }
             if (StringUtils.isNotBlank(dogStatus) && !"0".equals(dogStatus) && !"1".equals(dogStatus)) {
diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/resources/excel/居民信息录入模板.xls
index 6bc7b8f344d80c10b6ee7fc07f0b1277769494bb..af6b036394f745bdbec821d5959250db85ef97e9 100644
GIT binary patch
delta 3296
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

delta 10121
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