From 22a8cf0fc39555be78a030d208215fa7f6ad6bc4 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期三, 28 四月 2021 10:34:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngPopulationServeExcelListen.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 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 76553c8..1e970ec 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
@@ -186,13 +186,27 @@
voList.add(vo);
index++;
}
- if(populationImportErrorVOList.isEmpty()){
- R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
- if (!R.isOk(r)) {
- throw new ServiceException(r.getMsg());
+ //客户需要暂时注释，等客户处理完成需要恢复
+// if(populationImportErrorVOList.isEmpty()){
+// R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+// if (!R.isOk(r)) {
+// throw new ServiceException(r.getMsg());
+// }
+// }else{
+// throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+// }
+ R r = communityService.listSavePopulationServeExcelVO(voList, communityId);
+ if (!R.isOk(r)) {
+ String errMsg = r.getMsg();
+ List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg,ComMngPopulationImportErrorVO.class);
+ if(!errorList.isEmpty()){
+ populationImportErrorVOList.addAll(errorList);
}
- }else{
throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ }else{
+ if(!populationImportErrorVOList.isEmpty()){
+ throw new ServiceException("500", JSON.toJSONString(populationImportErrorVOList));
+ }
}
} catch (NumberFormatException e) {
List<ComMngPopulationImportErrorVO> populationImportErrorVOList = new ArrayList<>();
--
Gitblit v1.7.1