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

fix: 国标外标支持根据标准号查询

Browse Source
This commit is contained in:
mzaxd
2024-02-02 10:13:31 +08:00
parent 61f4a83eee
commit c93af86c79
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/common/service/impl/LawsCommonServiceImpl.java
+3
View File
@@ -1569,6 +1569,9 @@ public class LawsCommonServiceImpl implements ILawsCommonService {
} else {
singleStandard = getSingleStandard(standardNo, null);
}
if (singleStandard == null) {
throw new JeroBootException(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
}
history.setStandardId(id);
history.setStandardNumber(singleStandard.getStandardNumber());
history.setStandardName(singleStandard.getStandardName());
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsDomesticController.java
+1 -1
View File
@@ -143,7 +143,7 @@ public class LawsDomesticController {
@GetMapping(value = "getByIdAndModule")
@ApiOperationSupport(order = 7)
@RequiresPermissions("domesticStandard:search")
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id,
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id,
@RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type,
@RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);
laws-modules/src/main/java/com/jero/modules/laws/standard/controller/LawsOverseasController.java
+1 -1
View File
@@ -134,7 +134,7 @@ public class LawsOverseasController {
@GetMapping(value = "getByIdAndModule")
@ApiOperationSupport(order = 7)
@RequiresPermissions("overseasStandard:search")
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id") @ApiParam("主键") String id,
public Result<Map<String,Object>> getByIdAndModule(@RequestParam(name="id", required = false) @ApiParam("主键") String id,
@RequestParam(name="type") @ApiParam("类型（1详情，2新增编辑）") String type,
@RequestParam(name="standardNumber", required = false) @ApiParam("标准编号") String standardNumber) {
lawsCommonService.addLookHistory(id, type, MODULE_VALUE, standardNumber);