From 36b98729c637ed999fb42a5888825083a6817a6e Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 8 Nov 2023 11:25:21 +0800
Subject: [PATCH] fix: 78304
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

企标--导入--稽查内容的整改部门带出回显
---
 .../com/jero/modules/laws/common/util/ImportUtil.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
index 5b3b7ec5..9ebb8ef4 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/ImportUtil.java
@@ -93,7 +93,9 @@ public class ImportUtil {
             String standardClass = "";
             String yearNumber = "";
             Date releaseDate = null;
+            String releaseDateRow = "";
             Date implementationDate = null;
+            String implementationDateRow = "";
             StringBuilder errMsg = new StringBuilder("第" + line + "行");
             Map<String, Object> parameterMap = new HashMap<>();
             boolean standardValidFlag = false;
@@ -398,9 +400,11 @@ public class ImportUtil {
                     } else {
                         if (tag.getDbFieldName().equals("release_date")) {
                             releaseDate = this.convertDate(cellValue);
+                            releaseDateRow = row;
                         }
                         if (tag.getDbFieldName().equals("implementation_date")) {
                             implementationDate = this.convertDate(cellValue);
+                            implementationDateRow = row;
                         }
                     }
                 }
@@ -447,8 +451,8 @@ public class ImportUtil {
                 calendar.setTime(implementationDate);
                 calendar.add(Calendar.DAY_OF_MONTH, -15);
                 if (!releaseDate.before(calendar.getTime())) {
-                    log.error("第" + line + "行的实施日期必须大于发布日期15天 ");
-                    errMsg.append("第").append(line).append("行的实施日期必须大于发布日期15天 ");
+                    log.error("第" + implementationDateRow + "列的实施日期必须大于第" + releaseDateRow + "列的发布日期15天 ");
+                    errMsg.append("第").append(implementationDateRow).append("列的实施日期必须大于第").append(releaseDateRow).append("列的发布日期15天 ");
                 }
             }
             if (errMsg.toString().contains("列") || errMsg.toString().contains("重复") || errMsg.toString().contains("已存在")) {
@@ -491,9 +495,11 @@ public class ImportUtil {
                 // 获取第四行前两个单元格的内容
                 String cellContent1 = getCellContent(row.getCell(0));
                 String cellContent2 = getCellContent(row.getCell(1));
+                String cellContent3 = this.convertSingleOrgId(getCellContent(row.getCell(2)));
                 LinkedHashMap<String, String> inspectContentMap = new LinkedHashMap<>();
                 inspectContentMap.put("clause", cellContent1);
                 inspectContentMap.put("requirement", cellContent2);
+                inspectContentMap.put("rectificationDepartment", cellContent3);
                 checkList.add(inspectContentMap);
             }
         } catch (Exception e) {