From f63b6df1abda2803e0c6e909b64fdaacc4f7ad10 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Wed, 27 Sep 2023 17:24:44 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BC=81=E6=A0=87=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=A0=87=E5=87=86=E5=8F=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/laws/common/util/ImportUtil.java | 47 ++++++++++--------- 1 file changed, 24 insertions(+), 23 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 dc5f6f11..9d0abe9d 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 @@ -83,30 +83,31 @@ public class ImportUtil { if (!cellValue.matches("^[A-Z]{1,2}/[A-Z]{2} [1-9A-HJ-Z]\\d{4}-\\d{4}$")) { log.error("第" + (i + 1) + "行第" + (j + 1) + "列输入的标准编号格式不正确"); errMsgList.add("第" + (i + 1) + "行第" + (j + 1) + "列输入的标准编号格式不正确"); + } else { + // 拆分成两部分，前半部分和后半部分 + String[] mainParts = cellValue.split(" "); + String firstPart = mainParts[0]; + String secondPart = mainParts[1]; + + // 拆分前半部分获取企业标准代号和企业名称代号 + String[] firstPartElements = firstPart.split("/"); + String enterpriseStandardCode = firstPartElements[0]; + String enterpriseNameCode = firstPartElements[1]; + + // 拆分后半部分获取标准类别代号，顺序号和年代号 + String[] secondPartElements = secondPart.split("-"); + String categoryAndSequence = secondPartElements[0]; + String yearCode = secondPartElements[1]; + + // 从标准类别代号和顺序号字符串中分离出标准类别代号和顺序号 + String categoryCode = categoryAndSequence.substring(0, 1); + + // 转成字典值并存入 + parameterMap.put(FieldCommon.ENTERPRISE_STANDARD_CODE, this.convertDictValue("enterprise_standard_code", enterpriseStandardCode)); + parameterMap.put(FieldCommon.ENTERPRISE_NAME_CODE, this.convertDictValue("enterprise_name_code", enterpriseNameCode)); + parameterMap.put(FieldCommon.STANDARD_CATEGORY_CODE, this.convertDictValue("standard_category_code", categoryCode)); + parameterMap.put(FieldCommon.YEAR_NUMBER, yearCode); } - // 拆分成两部分，前半部分和后半部分 - String[] mainParts = cellValue.split(" "); - String firstPart = mainParts[0]; - String secondPart = mainParts[1]; - - // 拆分前半部分获取企业标准代号和企业名称代号 - String[] firstPartElements = firstPart.split("/"); - String enterpriseStandardCode = firstPartElements[0]; - String enterpriseNameCode = firstPartElements[1]; - - // 拆分后半部分获取标准类别代号，顺序号和年代号 - String[] secondPartElements = secondPart.split("-"); - String categoryAndSequence = secondPartElements[0]; - String yearCode = secondPartElements[1]; - - // 从标准类别代号和顺序号字符串中分离出标准类别代号和顺序号 - String categoryCode = categoryAndSequence.substring(0, 1); - - // 转成字典值并存入 - parameterMap.put(FieldCommon.ENTERPRISE_STANDARD_CODE, this.convertDictValue("enterprise_standard_code", enterpriseStandardCode)); - parameterMap.put(FieldCommon.ENTERPRISE_NAME_CODE, this.convertDictValue("enterprise_name_code", enterpriseNameCode)); - parameterMap.put(FieldCommon.STANDARD_CATEGORY_CODE, this.convertDictValue("standard_category_code", categoryCode)); - parameterMap.put(FieldCommon.YEAR_NUMBER, yearCode); } } if (FieldShowTypeEnum.SINGLE_DATE_PICKER.getValue().equals(tag.getFieldShowType())) {