From 7a2e1fd9e34ab58caf9fa8565e94dd9fcd174a1a Mon Sep 17 00:00:00 2001
From: manailin <261030956@qq.com>
Date: 星期六, 12 六月 2021 17:46:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/test_excel610' into test_excel610
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java | 7 ++-----
1 files changed, 2 insertions(+), 5 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java
index a56cf42..6aa2f3a 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/listen/ComMngBuildingExcelListen.java
@@ -10,7 +10,6 @@
import com.panzhihua.common.model.vos.community.ComMngPopulationImportErrorVO;
import com.panzhihua.common.service.community.CommunityService;
import com.panzhihua.common.service.grid.GridService;
-import com.panzhihua.common.utlis.ListUtils;
import com.panzhihua.common.utlis.Snowflake;
import lombok.extern.slf4j.Slf4j;
@@ -18,7 +17,6 @@
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
-import java.util.stream.Collectors;
/**
* @description: 社区楼栋导入监听
@@ -26,7 +24,6 @@
*/
@Slf4j
public class ComMngBuildingExcelListen extends AnalysisEventListener<Map<Integer, String>> {
-
private CommunityService communityService;
private GridService gridService;
@@ -132,8 +129,8 @@
}
//根据list中的IdCard城市来去重
- List<ComMngBuildingExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngBuildingExcelVO::getName)).collect(Collectors.toList());
- R r = communityService.listSaveBuildingExcelVO(newVoList, communityId, 123141L);
+// List<ComMngBuildingExcelVO> newVoList = voList.stream().filter(ListUtils.distinctByKey(ComMngBuildingExcelVO::getName)).collect(Collectors.toList());
+ R r = communityService.listSaveBuildingExcelVO(voList, communityId);
if (!R.isOk(r)) {
String errMsg = r.getMsg();
List<ComMngPopulationImportErrorVO> errorList = JSON.parseArray(errMsg, ComMngPopulationImportErrorVO.class);
--
Gitblit v1.7.1