From 4e22972fe483236548e1b357302363f2d815117e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Wed, 2 Mar 2022 13:46:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E7=A8=8B=E5=BA=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcPartymemberStyleServiceImpl.java   | 73 ++++++++++---------
 1 file changed, 37 insertions(+), 36 deletions(-)

diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
index 77caf1bede..4abeba9207 100644
--- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
+++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/IcPartymemberStyleServiceImpl.java
@@ -326,44 +326,45 @@ public class IcPartymemberStyleServiceImpl extends BaseServiceImpl<IcPartymember
                     iterator.remove();
                 }
             }
-            if (CollectionUtils.isEmpty(result)) {
-            /*Collections.sort(numList);
-            String subList = numList.stream().map(String::valueOf).collect(Collectors.joining("、"));
-            return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "第" + subList + "行未成功！");*/
-                erroeImport(fileList);
-                return;
-            }
-            List<IcPartymemberStyleImageEntity> imageList = new ArrayList<>();
-            List<IcPartymemberStyleEntity> list = result.stream().map(item -> {
-                IcPartymemberStyleEntity entity = new IcPartymemberStyleEntity();
-                entity.setId(UUID.randomUUID().toString().replace("-", ""));
-                entity.setCustomerId(tokenDto.getCustomerId());
-                entity.setAgencyId(staffInfoCache.getAgencyId());
-                entity.setGridId(gridMap.get(item.getGridName()));
-                GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId());
-                if (null != gridInfo) {
-                    entity.setGridPids(gridInfo.getPids());
-                }
-                entity.setName(item.getName());
-                entity.setMainDeed(item.getMainDeed());
-                IcPartymemberStyleCategoryDictEntity dictEntity=categoryDictMap.get(item.getCategoryName());
-                entity.setCategoryId(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getId());
-                entity.setCategoryCode(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getCategoryCode());
-                AtomicInteger i = new AtomicInteger();
-                return entity;
-            }).collect(Collectors.toList());
+            /*if (CollectionUtils.isEmpty(result)) {
+                Collections.sort(numList);
+                String subList = numList.stream().map(String::valueOf).collect(Collectors.joining("、"));
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "第" + subList + "行未成功！");
+            }*/
+            if (!CollectionUtils.isEmpty(result)) {
+                List<IcPartymemberStyleImageEntity> imageList = new ArrayList<>();
+                List<IcPartymemberStyleEntity> list = result.stream().map(item -> {
+                    IcPartymemberStyleEntity entity = new IcPartymemberStyleEntity();
+                    entity.setId(UUID.randomUUID().toString().replace("-", ""));
+                    entity.setCustomerId(tokenDto.getCustomerId());
+                    entity.setAgencyId(staffInfoCache.getAgencyId());
+                    entity.setGridId(gridMap.get(item.getGridName()));
+                    GridInfoCache gridInfo = CustomerOrgRedis.getGridInfo(entity.getGridId());
+                    if (null != gridInfo) {
+                        entity.setGridPids(gridInfo.getPids());
+                    }
+                    entity.setName(item.getName());
+                    entity.setMainDeed(item.getMainDeed());
+                    IcPartymemberStyleCategoryDictEntity dictEntity=categoryDictMap.get(item.getCategoryName());
+                    entity.setCategoryId(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getId());
+                    entity.setCategoryCode(null == dictEntity ? StrConstant.EPMETY_STR : dictEntity.getCategoryCode());
+                    AtomicInteger i = new AtomicInteger();
+                    return entity;
+                }).collect(Collectors.toList());
 
-            insertBatch(list);
-            icPartymemberStyleImageService.insertBatch(imageList);
+                insertBatch(list);
+                icPartymemberStyleImageService.insertBatch(imageList);
 
-        /*String str = String.format("共%s条，成功导入%s条。", numList.size() + result.size(), numList.size() + result.size() - numList.size());
-        if (numList.size() > NumConstant.ZERO) {
-            Collections.sort(numList);
-            String subList = numList.stream().map(String::valueOf).collect(Collectors.joining("、"));
-            log.warn(str + "第" + subList + "行未成功！");
-            return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str + "第" + subList + "行未成功！");
-        }
-        return new Result().ok(str);*/
+                /*String str = String.format("共%s条，成功导入%s条。", numList.size() + result.size(), numList.size() + result.size() - numList.size());
+                if (numList.size() > NumConstant.ZERO) {
+                    Collections.sort(numList);
+                    String subList = numList.stream().map(String::valueOf).collect(Collectors.joining("、"));
+                    log.warn(str + "第" + subList + "行未成功！");
+                    return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), str + "第" + subList + "行未成功！");
+                }
+                return new Result().ok(str);*/
+            }
+            //生成导入失败数据对应的文件，修改任务状态
             String url = erroeImport(fileList);
             upImportTask(url, taskId, tokenDto.getUserId(), true);
         } catch (Exception e) {