From 929ff93a7a9db5b9fb0e3ce8e45a66ce59ea1767 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期三, 11 八月 2021 17:53:57 +0800
Subject: [PATCH] Merge branch 'test' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java | 132 +++++++++++++++++++++++++++++--------------
1 files changed, 89 insertions(+), 43 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
index 4d1c347..957255e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java
@@ -15,10 +15,7 @@
import com.panzhihua.common.exceptions.ServiceException;
import com.panzhihua.common.model.vos.BcDictionaryVO;
import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMajorExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMajorMistakeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationMistakeExcelVO;
-import com.panzhihua.common.model.vos.community.ComMngPopulationRehabilitationMistakeExcelVO;
+import com.panzhihua.common.model.vos.community.*;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.PayUtil;
@@ -208,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());
}
- 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());
}
- 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());
}
- vo.setHouseNo(oneData.get(7).trim());
if(StringUtils.isNotEmpty(oneData.get(8))){
Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(8));
if(isOk.equals(-1)){
@@ -318,31 +321,66 @@
vo.setEconomicCondition(oneData.get(15).trim());
}
if(StringUtils.isNotEmpty(oneData.get(16))){
- vo.setGuarDian(oneData.get(16).trim());
+ vo.setPersonType(oneData.get(16).trim());
}
if(StringUtils.isNotEmpty(oneData.get(17))){
- vo.setGuarDianPhone(oneData.get(17).trim());
+ vo.setFamilySituation(oneData.get(17).trim());
}
if(StringUtils.isNotEmpty(oneData.get(18))){
- Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
+ vo.setCustodyPerson(oneData.get(18).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(19))){
+ Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19));
if(isOk.equals(-1)){
index++;
ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
setMistake(oneData, mistake);
- mistake.setMistake("您填写的与患者关系有误");
+ mistake.setMistake("您填写的与监护人关系有误");
mistakes.add(mistake);
continue;
}
- vo.setPatientRelation(isOk);
- }
- if(StringUtils.isNotEmpty(oneData.get(19))){
- vo.setDiagnose(oneData.get(19).trim());
+ vo.setCustodyRelation(isOk);
}
if(StringUtils.isNotEmpty(oneData.get(20))){
- vo.setOther(oneData.get(20).trim());
+ vo.setCustodyCardNo(oneData.get(20).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(21))){
+ vo.setCustodyPersonPhone(oneData.get(21).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(22))){
+ vo.setCustodyAddress(oneData.get(22).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(23))){
+ vo.setHelpPerson(oneData.get(23).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(24))){
+ vo.setHelpPersonPhone(oneData.get(24).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(25))){
+ vo.setHelpMethod(oneData.get(25).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(26))){
+ vo.setHelpSituation(oneData.get(26).trim());
+ }
+ if(StringUtils.isNotEmpty(oneData.get(27))){
+ Integer isOk = PopulHouseUseEnum.getCodeByName(oneData.get(27));
+ if(isOk.equals(-1)){
+ ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+ index++;
+ setMistake(oneData, mistake);
+ mistake.setMistake("您填写的是否违法犯罪有误");
+ mistakes.add(mistake);
+ continue;
+ }
+ vo.setIsCrime(isOk);
+ }else {
+ vo.setIsCrime(PopulHouseUseEnum.getCodeByName("否"));
+ }
+ if(StringUtils.isNotEmpty(oneData.get(28))){
+ vo.setCrimeSutiation(oneData.get(28).trim());
}
vo.getUserTagStr().add("重精人员");
- for (int i = 21; i < headSize; i++) {
+ for (int i = 29; i < headSize; i++) {
if (oneData.get(i) != null && oneData.get(i).equals("是")) {
vo.getUserTagStr().add(headData.get(i).substring(0,headData.get(i).indexOf("(")));
}
@@ -427,11 +465,19 @@
vo.setCensusRegister(map.get(13));
vo.setCultureLevel(map.get(14));
vo.setEconomicCondition(map.get(15));
- vo.setGuarDian(map.get(16));
- vo.setGuarDianPhone(map.get(17));
- vo.setPatientRelation(map.get(18));
- vo.setDiagnose(map.get(19));
- vo.setOther(map.get(20));
+ vo.setPersonType(map.get(16));
+ vo.setFamilySituation(map.get(17));
+ vo.setCustodyPerson(map.get(18));
+ vo.setCustodyRelation(map.get(19));
+ vo.setCustodyCardNo(map.get(20));
+ vo.setCustodyPersonPhone(map.get(21));
+ vo.setCustodyAddress(map.get(22));
+ vo.setHelpPerson(map.get(23));
+ vo.setHelpPersonPhone(map.get(24));
+ vo.setHelpMethod(map.get(25));
+ vo.setHelpSituation(map.get(26));
+ vo.setIsCrime(map.get(27));
+ vo.setCrimeSutiation(map.get(28));
}
private String convertMarriage(String ma) {
--
Gitblit v1.7.1