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/ComMngPopulationCorrectExcelListen.java | 22 +++++-----
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationVeteransExcelListen.java | 22 +++++-----
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java | 4 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java | 22 +++++-----
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java | 6 +-
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java | 4 +-
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java | 2
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java | 2
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationMajorExcelListen.java | 20 +++++-----
16 files changed, 59 insertions(+), 59 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
index 3f2114d..237127b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationCorrectExcelListen.java
@@ -286,17 +286,17 @@
if (StringUtils.isNotEmpty(oneData.get(15))) {
vo.setCensusRegister(oneData.get(15).trim());
}
- if (StringUtils.isEmpty(oneData.get(16))) {
- Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(16));
- if (isOk.equals(-1)) {
- index++;
- ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
- setMistake(oneData, mistake);
- mistake.setMistake("您填写的学历有误");
- mistakes.add(mistake);
- continue;
- }
- vo.setCultureLevel(isOk);
+ if (StringUtils.isNotEmpty(oneData.get(16))) {
+// Integer isOk = PopulCultureLevelEnum.getCodeByName(oneData.get(16));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationCorrectMistakeExcelVO mistake = new ComMngPopulationCorrectMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("您填写的学历有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setCultureLevel(oneData.get(16).trim());
}
if (StringUtils.isNotEmpty(oneData.get(17))) {
vo.setCorrectPersonCode(oneData.get(17).trim());
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 798fee3..9392b57 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
@@ -303,16 +303,16 @@
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("您填写的与监护人关系有误");
- mistakes.add(mistake);
- continue;
- }
- vo.setCustodyRelation(isOk);
+// Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(19));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationMajorMistakeExcelVO mistake = new ComMngPopulationMajorMistakeExcelVO();
+// setMistake(oneData, mistake);
+// mistake.setMistake("您填写的与监护人关系有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setCustodyRelation(oneData.get(19).trim());
}
if (StringUtils.isNotEmpty(oneData.get(20))) {
vo.setCustodyCardNo(oneData.get(20).trim());
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
index a955e05..dd2eb95 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationRehabilitationExcelListen.java
@@ -308,17 +308,17 @@
vo.setMainRelatives(oneData.get(17).trim());
}
if (StringUtils.isNotEmpty(oneData.get(18))) {
- Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
- if (isOk.equals(-1)) {
- index++;
- ComMngPopulationRehabilitationMistakeExcelVO mistake =
- new ComMngPopulationRehabilitationMistakeExcelVO();
- setRehabilitationMistake(oneData, mistake);
- mistake.setMistake("您填写的与人员关系有误");
- mistakes.add(mistake);
- continue;
- }
- vo.setPatientRelation(isOk);
+// Integer isOk = PopulRelationEnum.getCodeByName(oneData.get(18));
+// if (isOk.equals(-1)) {
+// index++;
+// ComMngPopulationRehabilitationMistakeExcelVO mistake =
+// new ComMngPopulationRehabilitationMistakeExcelVO();
+// setRehabilitationMistake(oneData, mistake);
+// mistake.setMistake("您填写的与人员关系有误");
+// mistakes.add(mistake);
+// continue;
+// }
+ vo.setPatientRelation(oneData.get(18).trim());
}
if (StringUtils.isNotEmpty(oneData.get(19))) {
vo.setRehabReasonAndType(oneData.get(19).trim());
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;
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
index f5aaf05..f8417d0 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComCorrectPopulationVO.java
@@ -240,7 +240,7 @@
* 学历
*/
@ApiModelProperty("学历")
- private Integer cultureLevel;
+ private String cultureLevel;
/**
* 社区矫正人员编号
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java
index f46560d..ae9ef8e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMajorPopulationVO.java
@@ -91,7 +91,7 @@
* 与监护人关系
*/
@ApiModelProperty("与监护人关系")
- private Integer custodyRelation;
+ private String custodyRelation;
/**
* 监护人公民身份号码
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
index e16c1ed..ec99012 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationCorrectExcelVO.java
@@ -69,7 +69,7 @@
private String censusRegister;
@ExcelProperty(value = "学历", index = 16)
- private Integer cultureLevel;
+ private String cultureLevel;
@ExcelProperty(value = "社区矫正人员编号", index = 17)
private String correctPersonCode;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
index d7b5792..2d983e9 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationMajorExcelVO.java
@@ -77,7 +77,7 @@
private String custodyPerson;
@ExcelProperty(value = "与监护人关系", index = 19)
- private Integer custodyRelation;
+ private String custodyRelation;
@ExcelProperty(value = "监护人公民身份号码", index = 20)
private String custodyCardNo;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
index 8e5a268..942caf3 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationRehabilitationExcelVO.java
@@ -75,7 +75,7 @@
private String mainRelatives;
@ExcelProperty(value = "与人员关系", index = 18)
- private Integer patientRelation;
+ private String patientRelation;
@ExcelProperty(value = "列管原因及类型", index = 19)
private String rehabReasonAndType;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java
index 3b93ddf..d87ac20 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComMngPopulationVeteransExcelVO.java
@@ -41,8 +41,8 @@
@ExcelProperty(value = "照片", index = 6)
private String photo;
- @ExcelProperty(value = "户籍性质（1.城镇户口 2.农村户口）", index = 7)
- private Integer regiterNature;
+ @ExcelProperty(value = "户籍性质", index = 7)
+ private String regiterNature;
@ExcelProperty(value = "户口所在地", index = 8)
private String censusRegister;
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java
index f7e3ede..26f688d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComRehabilitationPopulationVO.java
@@ -74,7 +74,7 @@
* 与人员关系
*/
@ApiModelProperty("与人员关系")
- private Integer patientRelation;
+ private String patientRelation;
/**
* 列管原因及类型
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java
index 685a666..c38ec3b 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/ComVeteransPopulationVO.java
@@ -89,10 +89,10 @@
private String photo;
/**
- * 户籍性质（1.城镇户口 2.农村户口）
+ * 户籍性质
*/
- @ApiModelProperty("户籍性质（1.城镇户口 2.农村户口）")
- private Integer regiterNature;
+ @ApiModelProperty("户籍性质")
+ private String regiterNature;
/**
* 入伍时间
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java
index 39e8c17..db275ea 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComCorrectPopulationDO.java
@@ -197,7 +197,7 @@
/**
* 学历
*/
- private Integer cultureLevel;
+ private String cultureLevel;
/**
* 社区矫正人员编号
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
index 70b6b29..60ec11d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComMajorPopulationDO.java
@@ -77,7 +77,7 @@
/**
* 与监护人关系
*/
- private Integer custodyRelation;
+ private String custodyRelation;
/**
* 监护人公民身份号码
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
index b0e96c8..5749cf6 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComRehabilitationPopulationDO.java
@@ -62,7 +62,7 @@
/**
* 与人员关系
*/
- private Integer patientRelation;
+ private String patientRelation;
/**
* 列管原因及类型
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
index 9916029..1199878 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComVeteransPopulationDO.java
@@ -75,9 +75,9 @@
private String photo;
/**
- * 户籍性质（1.城镇户口 2.农村户口）
+ * 户籍性质
*/
- private Integer regiterNature;
+ private String regiterNature;
/**
* 入伍时间
--
Gitblit v1.7.1