From b4cb901063422aae82bfb3c3ba65f2b04ad14e1f Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Fri, 9 Aug 2024 20:13:21 +0800
Subject: [PATCH] =?UTF-8?q?fix:=2088352=20=E5=A4=96=E6=9D=A5=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E6=B3=95=E8=A7=84=E6=96=87=E6=9C=AC=E5=BA=93--?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5--=E5=BB=BA=E8=AE=AE=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=AD=98=E5=9C=A8=E9=87=8D=E5=A4=8D=E7=BC=96?=
 =?UTF-8?q?=E5=8F=B7=E7=9A=84=E8=83=BD=E5=A4=9F=E6=8F=90=E4=BE=9B=E8=A1=8C?=
 =?UTF-8?q?=E5=8F=B7=E6=A0=87=E5=87=86=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/laws/common/util/ImportUtil.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 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 85b74fd7..78078d8b 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
@@ -85,7 +85,7 @@ public class ImportUtil {
         for (int i = 3; i < sheet.getPhysicalNumberOfRows(); i++) {
             int line = i + 1;
             String standardNumber = "";
-            String standardClass = "";
+            String standardNumberTemp = "";
             String yearNumber = "";
             StringBuilder errMsg = new StringBuilder("第" + line + "行");
             Map<String, Object> parameterMap = new HashMap<>();
@@ -120,6 +120,8 @@ public class ImportUtil {
                                 log.error("第" + row + "列" + tag.getDbFieldTxt() + "为必填 ");
                                 errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("为必填 ");
                                 break;
+                            } else {
+                                standardNumberTemp = cell.toString().trim();
                             }
                         }
                         if (FieldCommon.YEAR_NUMBER.equals(tag.getDbFieldName())) {
@@ -135,15 +137,16 @@ public class ImportUtil {
                             }
                         }
                         // 校验标准号
-                        if (StrUtil.isNotBlank(standardNumber) && StrUtil.isNotBlank(yearNumber)) {
+                        if (StrUtil.isNotBlank(standardNumberTemp) && StrUtil.isNotBlank(yearNumber)) {
                             if ((TableNameEnum.DOMESTIC_REGULATIONS.getValue().equals(tag.getIsModel()))) {
                                 if (!yearNumber.equals("BLANK") && !this.yearValid(yearNumber)) {
                                     log.error("第" + row + "列" + tag.getDbFieldTxt() + "填写错误 ");
                                     errMsg.append("第").append(row).append("列").append(tag.getDbFieldTxt()).append("填写错误 ");
                                 } else {
-                                    String domesticStandardNumber = standardNumber;
+                                    String domesticStandardNumber = standardNumberTemp;
                                     if (!yearNumber.equals("BLANK")) {
-                                        domesticStandardNumber = standardNumber + "——" + yearNumber;
+                                        domesticStandardNumber = standardNumberTemp + "—" + yearNumber;
+                                        parameterMap.put(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
                                     }
                                     QueryWrapper<LawsDomesticStandard> domesticStandardQueryWrapper = new QueryWrapper<>();
                                     domesticStandardQueryWrapper.eq(FieldCommon.STANDARD_NUMBER, domesticStandardNumber);
@@ -152,7 +155,7 @@ public class ImportUtil {
                                     standardValidFlag = true;
                                     if (lawsDomesticStandard != null) {
                                         log.error("第" + line + "行的标准编号已存在 ");
-                                        errMsg.append("第").append(line).append("行的标准编号已存在");
+                                        errMsg.append("拼接后的标准编号已存在于库中");
                                         break;
                                     }
                                     // 判断是否有重复数据
@@ -165,7 +168,7 @@ public class ImportUtil {
                                 }
                             }
                             // 将转好的值加入Map
-                            parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumber);
+                            parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumberTemp);
                             parameterMap.put(FieldCommon.YEAR_NUMBER, yearNumber);
                         }
                     }