From 979b4ddde296cb976314de0aaa5e24caf253b3d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Tue, 16 Jul 2024 15:07:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/MarketStandardController.java    | 17 +++++++++++++++++
 .../MarketStandardDetailController.java         |  1 -
 .../service/ILawsMarketStandardService.java     |  8 ++++++++
 .../impl/LawsMarketStandardServiceImpl.java     | 13 +++++++++++++
 4 files changed, 38 insertions(+), 1 deletion(-)

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<LawsMarketStandard> 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<LawsMarketStandard>
      */
     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<LawsMarketStandar
         return result;
     }
 
+    @Override
+    public LawsMarketStandard queryById(String id) {
+        LawsMarketStandard lawsMarketStandard = getById(id);
+        if(Objects.isNull(lawsMarketStandard)){
+            throw new JeroBootException("数据不存在");
+        }
+        LambdaQueryWrapper<LawsMarketStandard> 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) {