ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update 国内海外标准编号生成逻辑

Browse Source
This commit is contained in:
liao
2023-09-14 17:00:15 +08:00
parent 97bbd92e52
commit 4c4d181faf
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/constant/FieldCommon.java
+4 -4
View File
@@ -48,10 +48,10 @@ public class FieldCommon {
public static final String YEAR_NUMBER = "year_number"; public static final String YEAR_NUMBER = "year_number";
// 标准名称 // 标准名称
public static final String STANDARD_NAME = "standard_name"; public static final String STANDARD_NAME = "standard_name";
// 国标 // 标准类别
public static final String GB = "GB"; public static final String STANDARD_CLASS = "standard_class";
// 外标 // 字典值统一后缀
public static final String FB = "FB"; public static final String _DICT_TEXT = "_dictText";
// 树节点编码 // 树节点编码
public static final String NODE_CODE = "nodeCode"; public static final String NODE_CODE = "nodeCode";
// 分隔符 // 分隔符
laws-modules/src/main/java/com/jero/modules/laws/common/service/ILawsCommonService.java
+1 -1
View File
@@ -90,5 +90,5 @@ public interface ILawsCommonService {
* @Date: 2023/9/14 15:42 * @Date: 2023/9/14 15:42
* @Description: 生成法规编号 * @Description: 生成法规编号
**/ **/
void setStandardNumber(Map<String, Object> parameterMap, String type); void setStandardNumber(Map<String, Object> parameterMap);
} }
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+7 -3
View File
@@ -496,11 +496,16 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
* @Description: 生成法规编号 * @Description: 生成法规编号
**/ **/
@Override @Override
public void setStandardNumber(Map<String, Object> parameterMap, String type) { public void setStandardNumber(Map<String, Object> parameterMap) {
// 标准类别
String standardClass = (String) parameterMap.get(FieldCommon.STANDARD_CLASS);
// 法规编号不能为空 // 法规编号不能为空
String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER); String standardNumber = (String) parameterMap.get(FieldCommon.STANDARD_NUMBER);
// 年代号 // 年代号
String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER); String yearNumber = (String) parameterMap.get(FieldCommon.YEAR_NUMBER);
if (StringUtils.isBlank(standardClass)) {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.STANDARD_CLASS);
}
if (StringUtils.isBlank(standardNumber)) { if (StringUtils.isBlank(standardNumber)) {
throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER, ""); throw new JeroBootException(ResultCommon.EMPTY_STANDARD_NUMBER, "");
} }
@@ -508,8 +513,7 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.YEAR_NUMBER); throw new JeroBootException(ResultCommon.EMPTY_COMMON, FieldCommon.YEAR_NUMBER);
} }
// 最后生成的法规编号 // 最后生成的法规编号
standardNumber = type + standardNumber + "-" + yearNumber; standardNumber = standardClass + standardNumber + "-" + yearNumber;
parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber); parameterMap.put(FieldCommon.STANDARD_NUMBER, standardNumber);
} }
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
+1 -1
View File
@@ -68,7 +68,7 @@ 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, FieldCommon.GB); 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));
} }
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
+1 -1
View File
@@ -66,7 +66,7 @@ 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, FieldCommon.FB); 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));
} }