From c1f1d586e05a537c1745e6536e4324a2b50e490e Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期五, 27 八月 2021 10:26:50 +0800
Subject: [PATCH] 特殊群体导入取消人员关系限制
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
index cea9a90..f82890d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java
@@ -176,16 +176,16 @@
vo.setPhoto(oneData.get(6));
}
if (StringUtils.isNotEmpty(oneData.get(7))) {
- Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim());
- if (isOk.equals(-1)) {
- index++;
- ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
- setVeteransMistake(oneData, mistake);
- mistake.setMistake("您填写的户籍性质有误");
- mistakes.add(mistake);
- continue;
- }
- vo.setRegiterNature(isOk);
+// Integer isOk = PopulRegiterNatureEnum.getCodeByName(oneData.get(7).trim());
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
+// setVeteransMistake(oneData, mistake);
+// mistake.setMistake("您填写的户籍性质有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setRegiterNature(oneData.get(7).trim());
}
if (StringUtils.isNotEmpty(oneData.get(8))) {
vo.setCensusRegister(oneData.get(8).trim());
@@ -338,7 +338,7 @@
index++;
ComMngPopulationVeteransMistakeExcelVO mistake = new ComMngPopulationVeteransMistakeExcelVO();
setVeteransMistake(oneData, mistake);
- mistake.setMistake("您填写的婚姻关系·有误");
+ mistake.setMistake("您填写的婚姻关系有误");
mistakes.add(mistake);
continue;
}
--
Gitblit v1.7.1