From 0db361d230398b42a2acaed153b62dbd787da04b 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 17:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B3=95=E8=A7=84=E6=B8=85=E5=8D=95=E5=88=86?=
 =?UTF-8?q?=E9=A1=B5=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/LawsMarketStandardMapper.java        |  7 +++++++
 .../mapper/xml/LawsMarketStandardMapper.xml     | 17 +++++++++++++++--
 .../impl/LawsMarketStandardServiceImpl.java     |  7 +++----
 3 files changed, 25 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 b7aa8d52..9ccc51e6 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
@@ -31,6 +31,13 @@ public interface LawsMarketStandardMapper extends BaseMapper<LawsMarketStandard>
      * @return
      */
     String getOneByManifestNo(String str);
+
+    /**
+     *  获取英文简称
+     * @param str
+     * @return
+     */
+    List<String> getOneByEnBase(List<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 f21779ef..7f8c357b 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
@@ -53,11 +53,24 @@
             GROUP BY manifest_no
         ) ms1 on ms1.min_id = ms.id and ms1.manifest_no_max = ms.manifest_no
         left join sys_user as u on u.id = ms.author
-        left join process_market_standard_release pms on pms.manifest_id = ms.id
-        left join process_all pa on pms.process_instance_id = pa.process_instance_id
+        left join (
+            select pms.manifest_id from process_market_standard_release pms
+            left join process_all pa ON pms.process_instance_id = pa.process_instance_id
+            where pa.prc_status = 1
+        ) pms1 ON pms1.manifest_id = ms.id
             ${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>
+    <select id="getOneByEnBase" resultType="java.lang.String">
+        select s2.en_base from sys_dict s1
+        left join sys_dict_item s2 on s2.del_flag = 0 and s1.id = s2.dict_id
+        where s1.dict_code = 'market_state' and s2.del_flag = 0
+        and s2.item_value in
+        <foreach collection="str" separator="," open="(" close=")" item="item">
+            #{item}
+        </foreach>
+        order by s2.create_time asc
+    </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 d3b41fc7..710c30d5 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
@@ -85,9 +85,8 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(StringUtils.isBlank(marketStandard.getProcessFlag())){
             return marketStandardMapper.queryByPage(page, queryWrapper);
         }else{
+            queryWrapper.isNull("pms1.manifest_id");
             // 发起流程使用
-            queryWrapper.and(i->i.isNull("pms.id").or().ne("pa.prc_status",1));
-            queryWrapper.groupBy("ms.id");
             return marketStandardMapper.queryByPageProcess(page, queryWrapper);
         }
     }
@@ -104,7 +103,6 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
                 "ms.manifest_name", marketStandard.getManifestName());
         if (StringUtils.isNotBlank(marketStandard.getCountry())) {
             if(marketStandard.getCountry().contains("-")){
-                // todo 验证父级是否为欧盟或类欧盟数据，带出父子级数据
                 String[] str = marketStandard.getCountry().split("-");
                 String parentItemValueA = "1";
                 String parentItemValueB = "2";
@@ -179,8 +177,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
      * @return
      */
     private String generateManifestNo(String country) {
+        List<String> listCountry = marketStandardMapper.getOneByEnBase(Arrays.asList(country.split(",")));
         // 生成清单编号
-        String s = "BZFG-" + country.replace(",","") + "-";
+        String s = "BZFG-" + String.join(",",listCountry) + "-";
         String manifestNo = marketStandardMapper.getOneByManifestNo(s);
         if(StringUtils.isBlank(manifestNo)){
             return s + "01";