update 标准编号生成
This commit is contained in:
+6
@@ -498,6 +498,12 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
|
|||||||
String standardNumber = esUtil.generateStandardNumber(parameterMap);
|
String standardNumber = esUtil.generateStandardNumber(parameterMap);
|
||||||
parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber);
|
parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber);
|
||||||
}
|
}
|
||||||
|
// 国标和外标
|
||||||
|
if (module.equals(TableNameEnum.DOMESTIC_REGULATIONS.getValue())
|
||||||
|
|| module.equals(TableNameEnum.FOREIGN_REGULATIONS.getValue())) {
|
||||||
|
// 拼接标准编号
|
||||||
|
setStandardNumber(parameterMap);
|
||||||
|
}
|
||||||
// 提前处理企标的稽查内容,否则后面转换会报错
|
// 提前处理企标的稽查内容,否则后面转换会报错
|
||||||
// List<LinkedHashMap> checkList = (List<LinkedHashMap>) parameterMap.get(FieldCommon.CHECK_LIST);
|
// List<LinkedHashMap> checkList = (List<LinkedHashMap>) parameterMap.get(FieldCommon.CHECK_LIST);
|
||||||
// List<EnterpriseStandardInspectContent> inspectContents = this.convertList(checkList);
|
// List<EnterpriseStandardInspectContent> inspectContents = this.convertList(checkList);
|
||||||
|
|||||||
-1
@@ -67,7 +67,6 @@ public class LawsDomesticController {
|
|||||||
@ApiOperation(value="国内法规标准-新增数据", notes="国内法规标准-新增数据")
|
@ApiOperation(value="国内法规标准-新增数据", notes="国内法规标准-新增数据")
|
||||||
@PostMapping(value = "/commonAdd")
|
@PostMapping(value = "/commonAdd")
|
||||||
public Result<String> commonAdd(@RequestBody Map<String,Object> parameterMap) {
|
public Result<String> commonAdd(@RequestBody Map<String,Object> parameterMap) {
|
||||||
lawsCommonService.setStandardNumber(parameterMap);
|
|
||||||
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
|
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
|
||||||
return Result.OK(lawsCommonService.commonAdd(parameterMap));
|
return Result.OK(lawsCommonService.commonAdd(parameterMap));
|
||||||
}
|
}
|
||||||
|
|||||||
-1
@@ -67,7 +67,6 @@ public class LawsOverseasController {
|
|||||||
@ApiOperation(value="海外法规标准-新增数据", notes="海外法规标准-新增数据")
|
@ApiOperation(value="海外法规标准-新增数据", notes="海外法规标准-新增数据")
|
||||||
@PostMapping(value = "/commonAdd")
|
@PostMapping(value = "/commonAdd")
|
||||||
public Result<String> commonAdd(@RequestBody Map<String,Object> parameterMap) {
|
public Result<String> commonAdd(@RequestBody Map<String,Object> parameterMap) {
|
||||||
lawsCommonService.setStandardNumber(parameterMap);
|
|
||||||
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
|
parameterMap.put(FieldCommon.MODULE, MODULE_VALUE);
|
||||||
return Result.OK(lawsCommonService.commonAdd(parameterMap));
|
return Result.OK(lawsCommonService.commonAdd(parameterMap));
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user