From cb85f58307a8a5bb4785d3bcb42675db86b74866 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Thu, 4 Jul 2024 11:53:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=B8=82=E5=9C=BA=E6=B3=95?=
 =?UTF-8?q?=E8=A7=84=E5=BA=93=E6=B8=85=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MarketStandardDetailController.java       |  4 ++--
 .../LawsMarketStandardDetailServiceImpl.java  | 21 ++++++++++++++++++-
 2 files changed, 22 insertions(+), 3 deletions(-)

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<LawsMarketStandardDetailMapper, LawsMarketStandardDetail>
     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<LawsMarketStandard> 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<String> listIds = Arrays.asList(manifestId.split(","));
         LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
         queryLawsMarketStandardDetail.in(LawsMarketStandardDetail::getManifestId,listIds);