From 31bfc084edf032f3ed7a454db3b542ad4d501a49 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Fri, 12 Jul 2024 14:09:36 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84=E6=B8=85?=
 =?UTF-8?q?=E5=8D=95=E7=BC=96=E5=8F=B7=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../marketStandard/mapper/LawsMarketStandardMapper.java  | 7 +++++++
 .../mapper/xml/LawsMarketStandardMapper.xml              | 3 +++
 .../service/impl/LawsMarketStandardServiceImpl.java      | 9 +++------
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java
index c5e657cc..b9c54da0 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/LawsMarketStandardMapper.java
@@ -21,6 +21,13 @@ public interface LawsMarketStandardMapper extends BaseMapper<LawsMarketStandard>
     IPage<LawsMarketStandard> queryByPage(Page<LawsMarketStandard> page, @Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
 
     List<LawsMarketStandard> queryByPage(@Param(Constants.WRAPPER) QueryWrapper<LawsMarketStandard> queryWrapper);
+
+    /**
+     *  获取最大编号
+     * @param str
+     * @return
+     */
+    String getOneByManifestNo(String str);
 }
 
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
index c4a7958d..6d6c3541 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/mapper/xml/LawsMarketStandardMapper.xml
@@ -43,4 +43,7 @@
         left join sys_user as u on u.id = ms.author
             ${ew.customSqlSegment}
     </select>
+    <select id="getOneByManifestNo" resultType="java.lang.String">
+        select max(manifest_no) as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
+    </select>
 </mapper>
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 290d3f10..f3b1c0b1 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
@@ -155,14 +155,11 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
     private String generateManifestNo(String country) {
         // 生成清单编号
         String s = "BZFG-" + country.replace(",","") + "-";
-        QueryWrapper<LawsMarketStandard> queryLawsMarketStandard = new QueryWrapper<>();
-        queryLawsMarketStandard.select("max(manifest_no) as manifest_no");
-        queryLawsMarketStandard.likeRight("manifest_no",s);
-        LawsMarketStandard lawsMarketStandard = getOne(queryLawsMarketStandard,false);
-        if(Objects.isNull(lawsMarketStandard)){
+        String manifestNo = marketStandardMapper.getOneByManifestNo(s);
+        if(StringUtils.isBlank(manifestNo)){
             return s + "01";
         }
-        String num = lawsMarketStandard.getManifestNo().substring(lawsMarketStandard.getManifestNo().length() - 2);
+        String num = manifestNo.substring(manifestNo.length() - 2);
         int m = Integer.parseInt(num);
         return s + (m >= 10 ? (m + 1) : "0" + (m + 1));
     }