From 1c8ed0e3e18d6ed97879cb2925db914a9d487314 Mon Sep 17 00:00:00 2001
From: CeDo <cedoogle@gmail.com>
Date: 星期四, 17 六月 2021 14:47:03 +0800
Subject: [PATCH] Merge branch 'master' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 28 ++++++++++++++--------------
1 files changed, 14 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
index 38d49da..033c458 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java
@@ -173,13 +173,13 @@
String relation = dictMap.get(ra);
if(StringUtils.isEmpty(relation)){
- vo.setRelationStr(ra);
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第6列");
-// importErrorVO.setErrorMsg("您填写的与户主关系有误");
-// populationImportErrorVOList.add(importErrorVO);
-// index++;
-// continue;
+// vo.setRelationStr(ra);
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第6列");
+ importErrorVO.setErrorMsg("您填写的与户主关系有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
}else{
vo.setRelation(Integer.valueOf(relation));
}
@@ -286,13 +286,13 @@
String ma = convertMarriage(oneData.get(19));
Integer isOk = PopulMarriageEnum.getCodeByName(ma);
if(isOk.equals(-1)){
- vo.setMarriageStr(ma);
-// ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
-// importErrorVO.setErrorPosition("第" + index + "行，第20列");
-// importErrorVO.setErrorMsg("您填写的婚姻状况有误");
-// populationImportErrorVOList.add(importErrorVO);
-// index++;
-// continue;
+// vo.setMarriageStr(ma);
+ ComMngPopulationImportErrorVO importErrorVO = new ComMngPopulationImportErrorVO();
+ importErrorVO.setErrorPosition("第" + index + "行，第20列");
+ importErrorVO.setErrorMsg("您填写的婚姻状况有误");
+ populationImportErrorVOList.add(importErrorVO);
+ index++;
+ continue;
}else{
vo.setMarriage(isOk);
}
--
Gitblit v1.7.1