From 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052 Mon Sep 17 00:00:00 2001
From: huanghongfa <huanghongfa123456>
Date: 星期三, 04 八月 2021 20:47:06 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test' into test
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
index 6ae1173..514242d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationDrugExcelListen.java
@@ -138,6 +138,9 @@
ArrayList<ComMngPopulationDrugMistakeExcelVO> mistakes = Lists.newArrayList();
for (Map<Integer, String> oneData : list) {
ComMngPopulationDrugExcelVO vo = new ComMngPopulationDrugExcelVO();
+ if (StringUtils.isNotEmpty(oneData.get(0))){
+ vo.setSerialNumber(oneData.get(0));
+ }
//姓名和身份证都为空,为空户，无需操作,否则就解析年龄，性别，出生年月日
if(StringUtils.isNotEmpty(oneData.get(1)) || StringUtils.isNotEmpty(oneData.get(3))){
if(StringUtils.isEmpty(oneData.get(1))){
@@ -423,6 +426,7 @@
}
private void setDrugMistake(Map<Integer, String> map, ComMngPopulationDrugMistakeExcelVO vo){
+ vo.setSerialNumber(map.get(0));
vo.setName(map.get(1));
vo.setCardNo(map.get(3));
vo.setNation(map.get(2));
--
Gitblit v1.7.1