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 1322939a..bfbbaca5 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 @@ -52,8 +52,8 @@ public class MarketStandardDetailController { @ApiOperationSupport(order = 2) @RequiresPermissions("marketStandard:detail") @Translation - public Result list(@RequestParam("manifestId") String manifestId) { - return lawsMarketStandardDetailService.getList(manifestId); + 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/impl/LawsMarketStandardDetailServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java index f68de8e7..ee1e5a2a 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/impl/LawsMarketStandardDetailServiceImpl.java @@ -16,6 +16,7 @@ import javax.annotation.Resource; import java.util.ArrayList; import java.util.Arrays; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -27,11 +28,29 @@ import java.util.stream.Collectors; public class LawsMarketStandardDetailServiceImpl extends ServiceImpl implements ILawsMarketStandardDetailService { + @Resource + private ILawsMarketStandardService marketStandardService; + + @Override - public Result getList(String manifestId) { + public Result getList(String manifestId,String manifestVersion) { if(StringUtils.isBlank(manifestId)){ return Result.error("id不能为空"); } + if(!StringUtils.isBlank(manifestVersion)){ + LawsMarketStandard lawsMarketStandardOld = marketStandardService.getById(manifestId); + if(Objects.isNull(lawsMarketStandardOld)){ + return Result.error("数据不存在"); + } + LambdaQueryWrapper queryLawsMarketStandard = new LambdaQueryWrapper<>(); + queryLawsMarketStandard.eq(LawsMarketStandard::getManifestNo,lawsMarketStandardOld.getManifestNo()); + queryLawsMarketStandard.eq(LawsMarketStandard::getManifestVersion,manifestVersion); + LawsMarketStandard lawsMarketStandard = marketStandardService.getOne(queryLawsMarketStandard,false); + if(Objects.isNull(lawsMarketStandard)){ + return Result.error(manifestVersion + "版本不存在"); + } + manifestId = lawsMarketStandard.getId(); + } List listIds = Arrays.asList(manifestId.split(",")); LambdaQueryWrapper queryLawsMarketStandardDetail = new LambdaQueryWrapper<>(); queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,listIds);