From 36dd34a7eb8733a9ec66d6d5c305bdf957421655 Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 11 八月 2021 17:44:06 +0800
Subject: [PATCH] 实有人口新增模板导入接口开发、无楼栋无单元号优化
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java | 73 ++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 33 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
index 34cf853..fe83163 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationLowSecurityExcelListen.java
+++ b/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());
}
- 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());
}
- 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());
}
- 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());
--
Gitblit v1.7.1