springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
@@ -213,33 +213,39 @@ continue; } vo.setDoorNo(oneData.get(6).trim()); if(StringUtils.isEmpty(oneData.get(7))){ index++; ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(7))){ // index++; // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(7))) { vo.setFloor(oneData.get(7).trim()); if(StringUtils.isEmpty(oneData.get(8))){ index++; ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(8))){ // index++; // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(8))) { vo.setUnitNo(oneData.get(8).trim()); if(StringUtils.isEmpty(oneData.get(9))){ index++; ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(9))){ // index++; // ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(9))) { vo.setHouseNo(oneData.get(9).trim()); } if(StringUtils.isNotEmpty(oneData.get(10))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCultExcelListen.java
@@ -239,33 +239,39 @@ continue; } vo.setDoorNo(oneData.get(9).trim()); if(StringUtils.isEmpty(oneData.get(10))){ index++; ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(10))){ // index++; // ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(10))) { vo.setFloor(oneData.get(10).trim()); if(StringUtils.isEmpty(oneData.get(11))){ index++; ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(11))){ // index++; // ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(11))) { vo.setUnitNo(oneData.get(11).trim()); if(StringUtils.isEmpty(oneData.get(12))){ index++; ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(12))){ // index++; // ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(12))) { vo.setHouseNo(oneData.get(12).trim()); } if(StringUtils.isNotEmpty(oneData.get(13))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(13)); if(isOk.equals(-1)){ @@ -343,7 +349,18 @@ vo.setJoinCultDate(DateUtil.parse(oneData.get(21).trim(), parsePatterns)); } if(StringUtils.isNotEmpty(oneData.get(22))){ vo.setIsExternalPublicity(Integer.valueOf(oneData.get(22).trim())); Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(22)); if(isOk.equals(-1)){ ComMngPopulationCultMistakeExcelVO mistake = new ComMngPopulationCultMistakeExcelVO(); index++; setMistake(oneData, mistake); mistake.setMistake("您填写的是否对外宣传有误"); mistakes.add(mistake); continue; } vo.setIsExternalPublicity(isOk); }else { vo.setIsExternalPublicity(PopulHouseUseEnum.getCodeByName("否")); } if(StringUtils.isNotEmpty(oneData.get(23))){ vo.setRemark(oneData.get(23).trim()); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDisabilityExcelListen.java
@@ -224,33 +224,39 @@ continue; } vo.setDoorNo(oneData.get(10).trim()); if(StringUtils.isEmpty(oneData.get(11))){ index++; ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO(); setDisabilityMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(11))){ // index++; // ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO(); // setDisabilityMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(11))) { vo.setFloor(oneData.get(11).trim()); if(StringUtils.isEmpty(oneData.get(12))){ index++; ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO(); setDisabilityMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(12))){ // index++; // ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO(); // setDisabilityMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(12))) { vo.setUnitNo(oneData.get(12).trim()); if(StringUtils.isEmpty(oneData.get(13))){ index++; ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO(); setDisabilityMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(13))){ // index++; // ComMngPopulationDisabilityMistakeExcelVO mistake = new ComMngPopulationDisabilityMistakeExcelVO(); // setDisabilityMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(13))) { vo.setHouseNo(oneData.get(13).trim()); } if(StringUtils.isNotEmpty(oneData.get(14))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(14)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
@@ -216,33 +216,39 @@ continue; } vo.setDoorNo(oneData.get(6).trim()); if(StringUtils.isEmpty(oneData.get(7))){ index++; ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO(); setDrugMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(7))){ // index++; // ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO(); // setDrugMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(7))) { vo.setFloor(oneData.get(7).trim()); if(StringUtils.isEmpty(oneData.get(8))){ index++; ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO(); setDrugMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(8))){ // index++; // ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO(); // setDrugMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(8))) { vo.setUnitNo(oneData.get(8).trim()); if(StringUtils.isEmpty(oneData.get(9))){ index++; ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO(); setDrugMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(9))){ // index++; // ComMngPopulationDrugMistakeExcelVO mistake = new ComMngPopulationDrugMistakeExcelVO(); // setDrugMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(9))) { vo.setHouseNo(oneData.get(9).trim()); } if(StringUtils.isNotEmpty(oneData.get(10))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(10)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationKeyExcelListen.java
@@ -214,33 +214,39 @@ continue; } vo.setDoorNo(oneData.get(7).trim()); if(StringUtils.isEmpty(oneData.get(8))){ index++; ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO(); setKeyMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(8))){ // index++; // ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO(); // setKeyMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(8))) { vo.setFloor(oneData.get(8).trim()); if(StringUtils.isEmpty(oneData.get(9))){ index++; ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO(); setKeyMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(9))){ // index++; // ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO(); // setKeyMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(9))) { vo.setUnitNo(oneData.get(9).trim()); if(StringUtils.isEmpty(oneData.get(10))){ index++; ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO(); setKeyMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(10))){ // index++; // ComMngPopulationKeyMistakeExcelVO mistake = new ComMngPopulationKeyMistakeExcelVO(); // setKeyMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(10))) { vo.setHouseNo(oneData.get(10).trim()); } if(StringUtils.isNotEmpty(oneData.get(11))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
@@ -22,6 +22,7 @@ import org.springframework.data.redis.core.ValueOperations; import java.math.BigDecimal; import java.math.RoundingMode; import java.util.ArrayList; import java.util.List; import java.util.Map; @@ -122,7 +123,7 @@ int index = 2; try { String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d"}; String[] parsePatterns = new String[]{"yyyy-MM-dd", "yyyy-M-dd", "yyyy-MM-d", "yyyy-M-d", "yyyy/MM/dd", "yyyy/M/dd", "yyyy/MM/d", "yyyy/M/d", "yyyy/MM", "yyyy/M", "yyyy-M", "yyyy-MM"}; ArrayList<ComMngPopulationLowSecurityExcelVO> voList = Lists.newArrayList(); // List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>(); ArrayList<ComMngPopulationLowSecurityMistakeExcelVO> mistakes = Lists.newArrayList(); @@ -225,33 +226,39 @@ continue; } vo.setDoorNo(oneData.get(13).trim()); if(StringUtils.isEmpty(oneData.get(14))){ index++; ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO(); setLowSecurityMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(14))){ // index++; // ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO(); // setLowSecurityMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(14))) { vo.setFloor(oneData.get(14).trim()); if(StringUtils.isEmpty(oneData.get(15))){ index++; ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO(); setLowSecurityMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(15))){ // index++; // ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO(); // setLowSecurityMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(15))) { vo.setUnitNo(oneData.get(15).trim()); if(StringUtils.isEmpty(oneData.get(16))){ index++; ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO(); setLowSecurityMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(16))){ // index++; // ComMngPopulationLowSecurityMistakeExcelVO mistake = new ComMngPopulationLowSecurityMistakeExcelVO(); // setLowSecurityMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(16))) { vo.setHouseNo(oneData.get(16).trim()); } if(StringUtils.isNotEmpty(oneData.get(17))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(17)); if(isOk.equals(-1)){ @@ -350,25 +357,25 @@ vo.setDistributionMethod(oneData.get(32).trim()); } if(StringUtils.isNotEmpty(oneData.get(33))){ vo.setGuaranteedAmount(new BigDecimal(oneData.get(33).trim())); vo.setGuaranteedAmount(new BigDecimal(oneData.get(33).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(34))){ vo.setReallocationAmount(new BigDecimal(oneData.get(34).trim())); vo.setReallocationAmount(new BigDecimal(oneData.get(34).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(35))){ vo.setDifferenceReliefAmount(new BigDecimal(oneData.get(35).trim())); vo.setDifferenceReliefAmount(new BigDecimal(oneData.get(35).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(36))){ vo.setClassifiedInsuredAmount(new BigDecimal(oneData.get(36).trim())); vo.setClassifiedInsuredAmount(new BigDecimal(oneData.get(36).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(37))){ vo.setTotalMonthlyFamilyIncome(new BigDecimal(oneData.get(37).trim())); vo.setTotalMonthlyFamilyIncome(new BigDecimal(oneData.get(37).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(38))){ vo.setAverageMonthlyFamilyIncome(new BigDecimal(oneData.get(38).trim())); vo.setAverageMonthlyFamilyIncome(new BigDecimal(oneData.get(38).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(39))){ vo.setTotalMonthlyFamilyExpenditure(new BigDecimal(oneData.get(39).trim())); vo.setTotalMonthlyFamilyExpenditure(new BigDecimal(oneData.get(39).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(40))){ vo.setLng(oneData.get(40).trim()); @@ -380,7 +387,7 @@ vo.setOriginateDate(oneData.get(42).trim()); } if(StringUtils.isNotEmpty(oneData.get(43))){ vo.setNursingFee(new BigDecimal(oneData.get(43).trim())); vo.setNursingFee(new BigDecimal(oneData.get(43).trim()).setScale(2, RoundingMode.HALF_UP)); } if(StringUtils.isNotEmpty(oneData.get(44))){ vo.setApplyReason(oneData.get(44).trim()); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -205,33 +205,39 @@ continue; } vo.setDoorNo(oneData.get(4).trim()); if(StringUtils.isEmpty(oneData.get(5))){ index++; ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(5))){ // index++; // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(5))) { vo.setFloor(oneData.get(5).trim()); if(StringUtils.isEmpty(oneData.get(6))){ index++; ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(6))){ // index++; // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(6))) { vo.setUnitNo(oneData.get(6).trim()); if(StringUtils.isEmpty(oneData.get(7))){ index++; ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(7))){ // index++; // ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(7))) { vo.setHouseNo(oneData.get(7).trim()); } if(StringUtils.isNotEmpty(oneData.get(8))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(8)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -216,33 +216,39 @@ continue; } vo.setDoorNo(oneData.get(7).trim()); if(StringUtils.isEmpty(oneData.get(8))){ index++; ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); setRehabilitationMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(8))){ // index++; // ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); // setRehabilitationMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(8))) { vo.setFloor(oneData.get(8).trim()); if(StringUtils.isEmpty(oneData.get(9))){ index++; ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); setRehabilitationMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(9))){ // index++; // ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); // setRehabilitationMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(9))) { vo.setUnitNo(oneData.get(9).trim()); if(StringUtils.isEmpty(oneData.get(10))){ index++; ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); setRehabilitationMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(10))){ // index++; // ComMngPopulationRehabilitationMistakeExcelVO mistake = new ComMngPopulationRehabilitationMistakeExcelVO(); // setRehabilitationMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(10))) { vo.setHouseNo(oneData.get(10).trim()); } if(StringUtils.isNotEmpty(oneData.get(11))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(11)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationSentenceExcelListen.java
@@ -219,33 +219,39 @@ continue; } vo.setDoorNo(oneData.get(8).trim()); if(StringUtils.isEmpty(oneData.get(9))){ index++; ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO(); setSentenceMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(9))){ // index++; // ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO(); // setSentenceMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(9))) { vo.setFloor(oneData.get(9).trim()); if(StringUtils.isEmpty(oneData.get(10))){ index++; ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO(); setSentenceMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(10))){ // index++; // ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO(); // setSentenceMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(10))) { vo.setUnitNo(oneData.get(10).trim()); if(StringUtils.isEmpty(oneData.get(11))){ index++; ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO(); setSentenceMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(11))){ // index++; // ComMngPopulationSentenceMistakeExcelVO mistake = new ComMngPopulationSentenceMistakeExcelVO(); // setSentenceMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(11))) { vo.setHouseNo(oneData.get(11).trim()); } if(StringUtils.isNotEmpty(oneData.get(12))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(12)); if(isOk.equals(-1)){ springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -302,45 +302,51 @@ continue; } vo.setDoorNo(oneData.get(7).trim()); if(StringUtils.isEmpty(oneData.get(8))){ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); // importErrorVO.setErrorPosition("第" + index + "行，第9列"); // importErrorVO.setErrorMsg("楼排号不可为空"); // populationImportErrorVOList.add(importErrorVO); index++; ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(8))){ //// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); //// importErrorVO.setErrorPosition("第" + index + "行，第9列"); //// importErrorVO.setErrorMsg("楼排号不可为空"); //// populationImportErrorVOList.add(importErrorVO); // index++; // ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(8))) { vo.setFloor(oneData.get(8).trim()); if(StringUtils.isEmpty(oneData.get(9))){ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); // importErrorVO.setErrorPosition("第" + index + "行，第10列"); // importErrorVO.setErrorMsg("单元号不可为空"); // populationImportErrorVOList.add(importErrorVO); index++; ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(9))){ //// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); //// importErrorVO.setErrorPosition("第" + index + "行，第10列"); //// importErrorVO.setErrorMsg("单元号不可为空"); //// populationImportErrorVOList.add(importErrorVO); // index++; // ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(9))) { vo.setUnitNo(oneData.get(9).trim()); if(StringUtils.isEmpty(oneData.get(10))){ // ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); // importErrorVO.setErrorPosition("第" + index + "行，第11列"); // importErrorVO.setErrorMsg("户室不可为空"); // populationImportErrorVOList.add(importErrorVO); index++; ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); setMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(10))){ //// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO(); //// importErrorVO.setErrorPosition("第" + index + "行，第11列"); //// importErrorVO.setErrorMsg("户室不可为空"); //// populationImportErrorVOList.add(importErrorVO); // index++; // ComMngPopulationMistakeExcelVO mistake = new ComMngPopulationMistakeExcelVO(); // setMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(10))) { vo.setHouseNo(oneData.get(10).trim()); } if(StringUtils.isNotEmpty(oneData.get(11))){ vo.setBuildPurpose(oneData.get(11).trim()); } springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
@@ -238,33 +238,39 @@ continue; } vo.setDoorNo(oneData.get(11).trim()); if(StringUtils.isEmpty(oneData.get(12))){ index++; ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); setVeteransMistake(oneData, mistake); mistake.setMistake("楼排号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(12))){ // index++; // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); // setVeteransMistake(oneData, mistake); // mistake.setMistake("楼排号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(12))) { vo.setFloor(oneData.get(12).trim()); if(StringUtils.isEmpty(oneData.get(13))){ index++; ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); setVeteransMistake(oneData, mistake); mistake.setMistake("单元号不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(13))){ // index++; // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); // setVeteransMistake(oneData, mistake); // mistake.setMistake("单元号不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(13))) { vo.setUnitNo(oneData.get(13).trim()); if(StringUtils.isEmpty(oneData.get(14))){ index++; ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); setVeteransMistake(oneData, mistake); mistake.setMistake("户室不可为空"); mistakes.add(mistake); continue; } // if(StringUtils.isEmpty(oneData.get(14))){ // index++; // ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO(); // setVeteransMistake(oneData, mistake); // mistake.setMistake("户室不可为空"); // mistakes.add(mistake); // continue; // } if(StringUtils.isNotEmpty(oneData.get(14))) { vo.setHouseNo(oneData.get(14).trim()); } if(StringUtils.isNotEmpty(oneData.get(15))){ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(15)); if(isOk.equals(-1)){ @@ -301,7 +307,7 @@ mistakes.add(mistake); continue; } vo.setHousePurpose(PopulHousePurposeEnum.getCodeByName(oneData.get(14).trim())); vo.setHousePurpose(isOk); } if(StringUtils.isNotEmpty(oneData.get(18))){ Integer isOk = PopulHouseControlStatusEnum.getCodeByName(oneData.get(18)); springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationTotalVO.java
@@ -38,4 +38,57 @@ @ApiModelProperty("小区总数") private Integer villageTotal; /** * 吸毒人员 */ @ApiModelProperty("吸毒人员") private Integer drugTotal; /** * 社区矫正人员 */ @ApiModelProperty("社区矫正人员") private Integer correctTotal; /** * 重精人员 */ @ApiModelProperty("重精人员") private Integer majorTotal; /** * 邪教人员 */ @ApiModelProperty("邪教人员") private Integer cultTotal; /** * 刑释人员 */ @ApiModelProperty("刑释人员") private Integer rehabilitationTotal; /** * 重点上访人员 */ @ApiModelProperty("重点上访人员") private Integer keyTotal; /** * 退役军人 */ @ApiModelProperty("退役军人") private Integer veteransTotal; /** * 残疾人 */ @ApiModelProperty("残疾人") private Integer disabilityTotal; /** * 低保户 */ @ApiModelProperty("低保户") private Integer LowSecurityTotal; } springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommonDataApi.java
@@ -460,7 +460,7 @@ return communityService.specialInputUser(pageInputUserDTO); } @ApiOperation(value = "特殊群体统计接口", response = ComMngPopulationVO.class) @ApiOperation(value = "实有单位统计接口", response = ComMngPopulationVO.class) @PostMapping("/special/statistics") public R getComMngRealCompanyTotalByAdmin() { //获取登陆用户绑定社区id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/CommonDataApi.java
@@ -454,7 +454,7 @@ * @return 导入结果 */ @Transactional(rollbackFor = Exception.class) @PostMapping("/common/data/population/importLowSecurity") @PostMapping("/population/importLowSecurity") public R listSavePopulationLowSecurityExcelVO(@RequestBody List<ComMngPopulationLowSecurityExcelVO> list, @RequestParam(value = "communityId") Long communityId) { return comMngPopulationService.listSaveLowSecurityPopulation(list, communityId); } springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComMngPopulationDAO.java
@@ -275,6 +275,15 @@ ",(select count(id) from com_mng_population where act_id = #{communityId} and out_or_local = 2) as outTotal " + ",(select count(id) from com_mng_population where act_id = #{communityId} and label is not null) as specialTotal " + ",(select count(village_id) from com_mng_village where community_id = #{communityId}) as villageTotal " + ",(select count(id) from com_drug_population where community_id = #{communityId}) as drugTotal " + ",(select count(id) from com_correct_population where community_id = #{communityId}) as correctTotal " + ",(select count(id) from com_major_population where community_id = #{communityId}) as majorTotal " + ",(select count(id) from com_cult_population where community_id = #{communityId}) as cultTotal " + ",(select count(id) from com_rehabilitation_population where community_id = #{communityId}) as rehabilitationTotal " + ",(select count(id) from com_key_population where community_id = #{communityId}) as keyTotal " + ",(select count(id) from com_veterans_population where community_id = #{communityId}) as veteransTotal " + ",(select count(id) from com_disability_population where community_id = #{communityId}) as disabilityTotal" + ",(select count(id) from com_low_security_population where community_id = #{communityId}) as lowSecurityTotal " + " from com_mng_population as cmp where act_id = #{communityId}") ComMngPopulationTotalVO getPopulationTotalByAdmin(@Param("communityId") Long communityId);
@@ -292,7 +292,7 @@ ComKeyPopulationVO comKeyPopulationVO = new ComKeyPopulationVO(); ComKeyPopulationDO comKeyPopulationDO = comKeyPopulationDAO.selectOne(new QueryWrapper<ComKeyPopulationDO>(). lambda().eq(ComKeyPopulationDO::getPopulationId, populationId)); if (null != comRehabilitationPopulationDO) { if (null != comKeyPopulationDO) { BeanUtils.copyProperties(comKeyPopulationDO, comKeyPopulationVO); comMngPopulationVO.setComKeyPopulationVO(comKeyPopulationVO); } @@ -528,14 +528,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -554,9 +560,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -731,14 +744,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -757,9 +776,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -934,14 +960,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -960,9 +992,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -1137,14 +1176,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -1163,9 +1208,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -1340,14 +1392,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -1366,9 +1424,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -1543,14 +1608,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -1569,9 +1640,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -1746,14 +1824,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -1772,9 +1856,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -1949,14 +2040,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -1975,9 +2072,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -2152,14 +2256,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -2178,9 +2288,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -2355,14 +2472,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -2381,9 +2504,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -2562,14 +2692,20 @@ if (vo.getDoorNo().contains("号")) { vo.setDoorNo(vo.getDoorNo().replace("号","")); } if (StringUtils.isNotEmpty(vo.getFloor())) { if(vo.getFloor().contains("栋")){ vo.setFloor(vo.getFloor().replace("栋","")); } } if (StringUtils.isNotEmpty(vo.getUnitNo())) { if(vo.getUnitNo().contains("单元")){ vo.setUnitNo(vo.getUnitNo().replace("单元","")); } } if (StringUtils.isNotEmpty(vo.getHouseNo())) { if(vo.getHouseNo().contains("号")){ vo.setHouseNo(vo.getHouseNo().replace("号","")); } } log.info("开始查询小区街路巷是否存在"); //查询小区街路巷是否存在 @@ -2588,9 +2724,16 @@ } StringBuilder address = new StringBuilder(); address.append(populationActVO.getProvinceName()).append(populationActVO.getCityName()).append(populationActVO.getDistrictName()) .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号").append(vo.getFloor()).append("栋") .append(vo.getUnitNo()).append("单元").append(vo.getHouseNo()).append("号"); .append(populationActVO.getStreetName()).append(comMngVillageDO.getAlley()).append(vo.getDoorNo()).append("号"); if (StringUtils.isNotEmpty(vo.getFloor())) { address.append(vo.getFloor()).append("栋"); } if (StringUtils.isNotEmpty(vo.getUnitNo())) { address.append(vo.getUnitNo()).append("单元"); } if (StringUtils.isNotEmpty(vo.getHouseNo())) { address.append(vo.getHouseNo()).append("号"); } vo.setAddress(address.toString()); log.info("开始查询小区街路巷是否存在完成"); @@ -3040,6 +3183,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3080,6 +3231,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3120,6 +3279,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3160,6 +3327,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3200,6 +3375,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3240,6 +3423,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3280,6 +3471,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3320,6 +3519,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3360,6 +3567,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) { @@ -3400,6 +3615,14 @@ populationDO.setVillageName(comMngVillageDO.getGroupAt()); populationDO.setCardNoStr(vo.getCardNo()); populationDO.setUpdateAt(new Date()); String cardNoAES = populationDO.getCardNo(); try { cardNoAES = AESUtil.encrypt128(vo.getCardNo(), aesKey); }catch (Exception e){ log.error("身份证加密失败"); } populationDO.setCardNo(cardNoAES); //新增的时候默认绑定房屋id // if ((vo.getIsRent() != null && vo.getIsRent().equals(PopulHouseUseEnum.SELF.getCode())) || // (vo.getIsResidence() != null && vo.getIsResidence().intValue() == 1)) {
