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 8025878f..309e3d53 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 @@ -498,6 +498,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService { String standardNumber = esUtil.generateStandardNumber(parameterMap); parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); } + // 国标和外标 + if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue()) + || module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) { + // 拼接标准编号 + setStandardNumber(parameterMap); + } // 提前处理企标的稽查内容,否则后面转换会报错 // List checkList = (List) parameterMap.get(FieldCommon.CHECK_LIST); // List inspectContents = this.convertList(checkList); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java index 5b5a9b9d..ba135197 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java @@ -67,7 +67,6 @@ public class LawsDomesticController { @ApiOperation(value="国内法规标准-新增数据", notes="国内法规标准-新增数据") @PostMapping(value = "/commonAdd") public Result commonAdd(@RequestBody Map parameterMap) { - lawsCommonService.setStandardNumber(parameterMap); parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); } diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java index 63abdfbf..2b08cb5c 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java @@ -67,7 +67,6 @@ public class LawsOverseasController { @ApiOperation(value="海外法规标准-新增数据", notes="海外法规标准-新增数据") @PostMapping(value = "/commonAdd") public Result commonAdd(@RequestBody Map parameterMap) { - lawsCommonService.setStandardNumber(parameterMap); parameterMap.put(FieldCommon.MODULE, MODULE_VALUE); return Result.OK(lawsCommonService.commonAdd(parameterMap)); }