From 6de448aedb2a33d13e1e936138bffb810269a02f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Thu, 30 Nov 2023 15:00:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=80=81=E6=B3=95=E8=A7=84=E4=BC=81?=
 =?UTF-8?q?=E6=A0=87=E6=8E=88=E6=9D=83=E9=83=A8=E9=97=A8=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/oldSystem/entity/ESAuthDept.java     |  4 +++
 .../LawsEnterpriseStandardServiceImpl.java    | 35 ++++++++-----------
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/ESAuthDept.java b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/ESAuthDept.java
index 2feaeb05..78fbc8cb 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/ESAuthDept.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/oldSystem/entity/ESAuthDept.java
@@ -40,6 +40,10 @@ public class ESAuthDept {
     @ApiModelProperty(value = "组织部门")
     private String deptName;
 
+    @Excel(name = "错误信息", width = 35)
+    @ApiModelProperty(value = "错误信息")
+    private String errorInfo;
+
     public boolean isEmptyRow() {
         return standardId == null &&
                 standardNumber == null &&
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
index 3e78fcb0..b5ba22ce 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/service/impl/LawsEnterpriseStandardServiceImpl.java
@@ -222,7 +222,9 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                     this.oldSysGBImport(gbDatalist, errImportList);
                 }
         }
-        this.exportWithExcel(response, errImportList, "OldSystemStandardErrorData.xls");
+        if (!errImportList.isEmpty()) {
+            this.exportWithExcel(response, errImportList, "OldSystemStandardErrorData.xls");
+        }
     }
 
     @Override
@@ -397,7 +399,7 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
     @Override
     public void importOldESAuthDeptExcel(MultipartFile file, HttpServletResponse response) {
         List<ESAuthDept> errImportList = new ArrayList<>();
-        // 验证文件是否为压缩格式file.getContentType()).contains("xls")
+        // 验证文件是否为压缩格式
         if (!Objects.requireNonNull(file.getOriginalFilename()).contains("xls")) {
             throw new JeroBootException("文件格式不正确，请上传Excel。");
         }
@@ -443,8 +445,6 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
             sysDeptWrapper.eq(SysDepart::getDelFlag, CommonConstant.DEL_FLAG_0.toString());
             sysDeptWrapper.eq(SysDepart::getStatus, 1);
             List<SysDepart> curDeptList = sysDepartService.list(sysDeptWrapper);
-            Map<String, List<SysDepart>> curDeptNameMap = curDeptList.stream().collect(Collectors.groupingBy(SysDepart::getDepartName));
-            Map<String, SysDepart> curDeptIdMap = curDeptList.stream().collect(Collectors.toMap(SysDepart::getId, o -> o));
             curDeptList.add(sysDepartService.getById("0"));
 
             List<OldSystemDepartRelation> drList = oldSystemDepartRelationService.list();
@@ -452,6 +452,10 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
 
             for (ESAuthDept ad : datalist) {
                 try {
+                    LawsEnterpriseStandard es = esMap.get(ad.getStandardId());
+                    if (es == null) {
+                        throw new JeroBootException("系统中未找到标准编号：" + ad.getStandardNumber());
+                    }
                     String oldDeptName = ad.getDeptName();
                     String oldHigherDeptName = ad.getHigherDeptName();
                     // 根据老部门名称从关系表中找到新部门名称
@@ -459,27 +463,16 @@ public class LawsEnterpriseStandardServiceImpl extends ServiceImpl<LawsEnterpris
                     if (oldSystemDepartRelation == null) {
                         throw new JeroBootException("未找到该部门的现部门名称：" + oldDeptName + "，上级部门名称：" + oldHigherDeptName + "，标准编号：" + ad.getStandardNumber());
                     } else {
-                        // 通过现部门名称找到对应的新部门
-                        List<SysDepart> curDepts = curDeptNameMap.get(oldSystemDepartRelation.getCurOrgName());
-                        if (curDepts == null || curDepts.isEmpty()) {
-                            throw new JeroBootException("未找到该部门，部门名称：" + oldDeptName + "，上级部门名称：" + oldHigherDeptName + "，标准编号：" + ad.getStandardNumber());
-                        }
+                        EnterpriseStandardAuthDept authDept = new EnterpriseStandardAuthDept();
+                        authDept.setStandardId(es.getId());
+                        authDept.setAuthDept(oldSystemDepartRelation.getCurOrgId());
+                        esAuthDeptService.save(authDept);
                     }
-                    // 如果只有一个则找到
-//                    List<String> deptNameList = "";
-//                    String curDeptId = curDeptNameMap.get(ad.getDeptName() + "-" + ad.getHigherDeptName()).getId();
-//                    if (StrUtil.isBlank(curDeptId)) {
-//                        log.error("导入部门对应出现错误：{}", "找不到对应的新部门");
-//                        log.error("错误数据：{}", ad.toString());
-//                        continue;
-//                    }
-//                    EnterpriseStandardAuthDept authDept = new EnterpriseStandardAuthDept();
-//                    authDept.setStandardId(esMap.get(ad.getStandardId()).getId());
-//                    authDept.setAuthDept(curDeptId);
-//                    esAuthDeptService.save(authDept);
                 } catch (Exception e) {
                     log.error("导入部门对应出现错误：{}", e.getMessage());
                     log.error("错误数据：{}", ad.toString());
+                    ad.setErrorInfo(e.getMessage());
+                    errImportList.add(ad);
                 }
             }
         } catch (Exception e) {