diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java index 57338932..fec146e0 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardController.java @@ -91,6 +91,23 @@ public class MarketStandardController { return Result.OK(result); } + + /** + * 详情 + * + * @param lawsMarketStandard + * @return + */ + @AutoLog(value = "外部标准库-市场法规清单-详情") + @ApiOperation(value = "外部标准库-市场法规清单-详情", notes = "外部标准库-市场法规清单-详情") + @GetMapping(value = "/queryById") + @ApiOperationSupport(order = 2) + @Translation + public Result queryById(LawsMarketStandard lawsMarketStandard) { + LawsMarketStandard result = marketStandardService.queryById(lawsMarketStandard.getId()); + return Result.OK(result); + } + /** * 导出excel */ diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java index ebe335c4..9466b43d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/controller/MarketStandardDetailController.java @@ -60,7 +60,6 @@ public class MarketStandardDetailController { @ApiOperation(value = "外部标准库-市场法规清单详情列表", notes = "外部标准库-市场法规清单详情列表") @GetMapping(value = "/list") @ApiOperationSupport(order = 2) - @RequiresPermissions("marketStandard:detail") @Translation public Result list(@RequestParam("manifestId") String manifestId, @RequestParam("manifestVersion") String manifestVersion) { return lawsMarketStandardDetailService.getList(manifestId,manifestVersion); diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java index 8a6faab9..45a63b87 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardService.java @@ -49,6 +49,14 @@ public interface ILawsMarketStandardService extends IService */ MarketStandardDetailVO detail(LawsMarketStandardDetail marketStandardDetail); + /** + * 根据id查看详情 + * @param id + * @return + */ + LawsMarketStandard queryById(String id); + + /** * 分页查询 * @param marketStandard diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java index 71182a80..b5a1604d 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardServiceImpl.java @@ -365,6 +365,19 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl queryLawsMarketStandard = new LambdaQueryWrapper<>(); + queryLawsMarketStandard.eq(LawsMarketStandard::getVersionFlag,lawsMarketStandard.getVersionFlag()); + long l = count(queryLawsMarketStandard); + lawsMarketStandard.setManifestVersion("V" + l + ".0"); + return lawsMarketStandard; + } + @Override @Transactional(rollbackFor = JeroBootException.class) public synchronized Result publish(String id) {