From 32385e5e8d13fb3b2a9121fd5bf482234b5f5ff6 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Tue, 21 Nov 2023 15:32:32 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BC=81=E6=A0=87=E6=96=B0=E5=A2=9E?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=E4=BF=9D=E5=AD=98=E9=A1=BA=E5=BA=8F?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/service/impl/LawsCommonServiceImpl.java | 13 ++++++++++++- .../enterprise/util/EnterpriseStandardUtil.java | 2 ++ .../standard/entity/LawsEnterpriseStandard.java | 6 ++++++ 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java index 168c40bb..be8b87b2 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java @@ -573,7 +573,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService { && null == parameterMap.get(FieldCommon.STANDARD_NUMBER)) { // 生成企标编号 String standardNumber = esUtil.generateStandardNumber(parameterMap); + String standardNumberTmp = EnterpriseStandardUtil.getSequenceNoFromStandardNo(standardNumber); parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); + parameterMap.put(FieldCommon.STANDARD_NUMBER_TEMP, standardNumberTmp); } // 国标和外标 if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue()) @@ -664,7 +666,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService { esAuthUserService.resetAuthDept(id, parameterMap.get(FieldCommon.AUTH_DEPT).toString()); } } - + // 企标顺序号添加 + if (TableNameEnum.ENTERPRISE_STANDARDS.getValue().equals(module)) { + String sequenceNo = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER_TEMP); + if (StringUtils.isNotBlank(sequenceNo)) { + LambdaUpdateWrapper esWrapper = new LambdaUpdateWrapper<>(); + esWrapper.eq(LawsEnterpriseStandard::getId, id); + esWrapper.set(LawsEnterpriseStandard::getStandardNumberTemp, sequenceNo); + lawsEnterpriseStandardService.update(esWrapper); + } + } return ResultCommon.OK; } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java index f68fc75f..2a3135fa 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/enterprise/util/EnterpriseStandardUtil.java @@ -97,6 +97,8 @@ public class EnterpriseStandardUtil { return standardNumber; } + + private String transEsCode(String esCode) { if (StringUtils.isNotBlank(esCode)) { List esCodeDictModelList = sysBaseAPI.getDictItems("enterprise_standard_code"); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java index 568a3f61..c4662b07 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/entity/LawsEnterpriseStandard.java @@ -300,6 +300,12 @@ public class LawsEnterpriseStandard implements Serializable { @ApiModelProperty(value = "授权部门") private String authDept; + /** + * 顺序号 + */ + @ApiModelProperty(value = "顺序号") + private String standardNumberTemp; + @TableField(exist = false) private static final long serialVersionUID = 1809789807789012221L; }