From c02b6811f382514e04df97e77d0622c8491ef139 Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Sat, 14 Sep 2024 14:55:34 +0800
Subject: [PATCH 01/14] =?UTF-8?q?[update]=20IAM=E5=90=8C=E6=AD=A5=E7=9A=84?=
 =?UTF-8?q?=E6=97=B6=E5=80=99=20=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8ID?=
 =?UTF-8?q?=E7=9A=84=E9=95=BF=E5=BA=A6=E4=B8=BA=2064?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index d6c3fe4a..268ea610 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -377,3 +377,8 @@ ALTER TABLE `sar_file_split_info`
 ALTER TABLE `laws_evaluation_not_met_library`
     ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`,
     ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;
+
+
+-- 2024-09-14 IAM同步的时候 修改部门ID的长度为 64
+ALTER TABLE sys_depart MODIFY COLUMN `id` varchar(64) NOT NULL COMMENT 'ID';
+ALTER TABLE sys_depart MODIFY COLUMN `parent_id` varchar(64) NULL COMMENT '父机构ID';
\ No newline at end of file

From 5c185c414406a743685b3d62df67c9282f733dc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Sat, 14 Sep 2024 16:07:55 +0800
Subject: [PATCH 02/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E9=97=A8id?=
 =?UTF-8?q?=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index 268ea610..19936947 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -381,4 +381,14 @@ ALTER TABLE `laws_evaluation_not_met_library`
 
 -- 2024-09-14 IAM同步的时候 修改部门ID的长度为 64
 ALTER TABLE sys_depart MODIFY COLUMN `id` varchar(64) NOT NULL COMMENT 'ID';
-ALTER TABLE sys_depart MODIFY COLUMN `parent_id` varchar(64) NULL COMMENT '父机构ID';
\ No newline at end of file
+ALTER TABLE sys_depart MODIFY COLUMN `parent_id` varchar(64) NULL COMMENT '父机构ID';
+ALTER TABLE laws_club_join_team MODIFY COLUMN `depart_id` varchar(64) NULL COMMENT '部门id';
+ALTER TABLE laws_club_meeting MODIFY COLUMN `notify_depart_id` varchar(64) NULL COMMENT '通知部门id';
+ALTER TABLE laws_club_research_information MODIFY COLUMN `feedback_depart` varchar(64) NULL COMMENT '反馈部门';
+ALTER TABLE laws_conformity_assessment_library_detail MODIFY COLUMN `auth_dept` varchar(64) NULL COMMENT '反馈部门';
+ALTER TABLE laws_enterprise_standard_inspect_content MODIFY COLUMN `rectification_department` varchar(64) NULL COMMENT '整改部门';
+ALTER TABLE laws_evaluation_not_met_library MODIFY COLUMN `auth_dept` varchar(64) NULL COMMENT '责任部门';
+ALTER TABLE laws_solicitation_clause MODIFY COLUMN `department` varchar(64) NULL COMMENT '提出部门';
+ALTER TABLE process_es_recheck MODIFY COLUMN `main_drafting_unit` varchar(64) NULL COMMENT '起草部门';
+ALTER TABLE sys_depart_permission MODIFY COLUMN `depart_id` varchar(64) NULL COMMENT '部门id';
+ALTER TABLE sys_user_agent MODIFY COLUMN `sys_org_code` varchar(64) NULL COMMENT '所属部门';

From 765c3cbe8a00a0a8cadaef39eae87a720f7630fc Mon Sep 17 00:00:00 2001
From: fengchenchen <fengchenchen@syxysoft.com>
Date: Sat, 14 Sep 2024 18:03:36 +0800
Subject: [PATCH 03/14] =?UTF-8?q?[update]=20=E6=AD=A3=E5=BC=8F=20IAM?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E7=9A=84=E6=97=B6=E5=80=99=20=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E7=AE=A1=E7=90=86-=E4=BA=BA=E5=91=98=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E4=BF=AE=E6=94=B9=E9=95=BF=E5=BA=A6=E4=B8=BA=2064?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index 19936947..0eba2a62 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -392,3 +392,6 @@ ALTER TABLE laws_solicitation_clause MODIFY COLUMN `department` varchar(64) NULL
 ALTER TABLE process_es_recheck MODIFY COLUMN `main_drafting_unit` varchar(64) NULL COMMENT '起草部门';
 ALTER TABLE sys_depart_permission MODIFY COLUMN `depart_id` varchar(64) NULL COMMENT '部门id';
 ALTER TABLE sys_user_agent MODIFY COLUMN `sys_org_code` varchar(64) NULL COMMENT '所属部门';
+
+-- 2024-09-14 IAM同步的时候 用户管理-人员类型修改长度为 64
+ALTER TABLE sys_user MODIFY COLUMN `type_id` varchar(64) NULL COMMENT '人员类型,000正式员工、002外部用户、001劳务工等';
\ No newline at end of file

From 990b2867f40198f01a1f84b29676953d7c12512c Mon Sep 17 00:00:00 2001
From: lijiarao <lijiarao@syxysoft.com>
Date: Wed, 18 Sep 2024 09:37:10 +0800
Subject: [PATCH 04/14] =?UTF-8?q?update=20=E6=8B=86=E5=88=86=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E7=BC=96=E8=BE=91=20=E7=9B=AE=E5=BD=95=E6=8B=96?=
 =?UTF-8?q?=E5=8A=A8=E5=90=8E=E5=88=B0=E5=8F=B3=E4=BE=A7=E6=9D=A1=E6=AC=BE?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FileSplitItemsEOServiceImpl.java  |  5 ++++-
 .../impl/SarFileSplitMenuEOServiceImpl.java        | 14 +++++++-------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
index 7606c490..6546c929 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/FileSplitItemsEOServiceImpl.java
@@ -2269,6 +2269,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                                 tableHtml = tableHtml.replaceAll("style","border=\"1\" style");// 解决导入的表格没线
                                 splitTableInfo.setTableHtml(tableHtml);
                             }catch (Exception e){
+                                log.error(e.getMessage(),e);
                                 throw new JeroBootException(sheet.getSheetName() + "页签数据异常");
                             }
                             getSheetTableList.add(splitTableInfo);
@@ -2295,11 +2296,12 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         FileUnZip.deleteDir(saveDirectory);
                         return message;
                     } catch (JeroBootException e){
+                        log.error(e.getMessage(),e);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         return Result.error(1, e.getMessage());
                     }catch (NullPointerException e){
-                        log.error(e.getMessage());
+                        log.error("读取失败，请严格按照模板文件导入数据",e);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         if(MessageUtils.getLanguage().getValue().equals(LanguageEnum.CN.getValue())){
@@ -2309,6 +2311,7 @@ public class FileSplitItemsEOServiceImpl extends ServiceImpl<FileSplitItemsEOMap
                         }
                         return Result.error(1, resultMsg);
                     }catch (Exception e) {
+                        log.error(e.getMessage(),e);
                         //删除原上传文件
                         FileUnZip.deleteDir(saveDirectory);
                         return Result.error(e.getMessage());
diff --git a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
index cf97149a..66cc8486 100644
--- a/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/split/service/impl/SarFileSplitMenuEOServiceImpl.java
@@ -3,6 +3,7 @@ package com.jero.modules.split.service.impl;
 import cn.hutool.core.collection.CollStreamUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
 import com.jero.modules.laws.documenttool.service.IDocumentSplitService;
@@ -381,23 +382,22 @@ public class SarFileSplitMenuEOServiceImpl extends ServiceImpl<SarFileSplitMenuE
         List<String> sourceIdList = Arrays.asList(sourceIds.split(","));
         // 获取要移动到的层级的最后一个 的排序值
         List<SarFileSplitMenuEO> lastMenuList = getLastMenu(parentMenu.getId(),displaySeq,sourceIdList);
-
-        if(displaySeq == 0){
-            displaySeq = parentMenu.getDisplaySeq();
+        if (CollectionUtil.isNotEmpty(lastMenuList)){
+            displaySeq = lastMenuList.stream().map(SarFileSplitMenuEO::getDisplaySeq).min(Comparator.comparing(x -> x)).orElse(null);
         }
         // 要移动的节点所有子集（包括本身）
         List<SarFileSplitMenuEO> sarFileSplitMenuEO1List = new ArrayList<>();
-        List<String> idList = new ArrayList<>();
-        for (int i = 0; i < sourceIdList.size(); i++) {
-            String sourceId = sourceIdList.get(i);
+        for (String sourceId : sourceIdList) {
             // 要移动的节点信息
             SarFileSplitMenuEO sarFileSplitMenuEO = baseMapper.findById(sourceId);
             sarFileSplitMenuEO.setParentId(parentId);
             sarFileSplitMenuEO1List.add(sarFileSplitMenuEO);
-            idList.add(sourceId);
         }
         List<SarFileSplitMenuEO> allList = new ArrayList<>();
         getChildren(allList, sarFileSplitMenuEO1List);
+        //for (SarFileSplitMenuEO splitMenuEO : allList) {
+        //    splitMenuEO.setParentId(parentId);
+        //}
         //排除
         getChildren(allList, lastMenuList);
 

From 057fd743d4f8a8c67dcc13db062a30c5afa04b06 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=A2=81=E7=90=A6=E6=B6=9B?= <liangqitao@syxysoft.com>
Date: Wed, 18 Sep 2024 09:45:06 +0800
Subject: [PATCH 05/14] fix:89974

---
 .../home/service/impl/LawsHomeSearchServiceImpl.java     | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index a4b4b93c..7aed79df 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -1533,8 +1533,13 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                 data.put("release_date", new SimpleDateFormat(YYYY_MM_DD).format(releaseDate));
             }
             if (!Objects.isNull(data.get("implementation_date"))){
-                Date implementationDate = (Date) data.get("implementation_date");
-                data.put("implementation_date", new SimpleDateFormat(YYYY_MM_DD).format(implementationDate));
+                try{
+                    Date implementationDate = (Date) data.get("implementation_date");
+                    data.put("implementation_date", new SimpleDateFormat(YYYY_MM_DD).format(implementationDate));
+                }catch (Exception e){
+                    String implementationDate = data.get("implementation_date").toString();
+                    data.put("implementation_date", implementationDate);
+                }
             }
         }
         return Result.OK(advancedSearchAll);

From c15ea897653d170bef1560f76c4a28cbf87615e7 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Wed, 18 Sep 2024 17:49:03 +0800
Subject: [PATCH 06/14] =?UTF-8?q?fix:=2089973=20=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E7=AC=A6=E5=90=88=E6=80=A7=E6=8E=92=E6=9F=A5=E6=B5=81=E7=A8=8B?=
 =?UTF-8?q?=EF=BC=88=E9=AB=98=E7=BA=A7=E7=BB=8F=E7=90=86/=E6=8A=80?=
 =?UTF-8?q?=E6=9C=AF=E5=AE=98=E6=89=B9=E5=87=86=EF=BC=89=20--=E6=9C=80?=
 =?UTF-8?q?=E5=90=8E=E8=8A=82=E7=82=B9=E6=8F=90=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=A4=AA=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index d6c3fe4a..29e4ac72 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -377,3 +377,7 @@ ALTER TABLE `sar_file_split_info`
 ALTER TABLE `laws_evaluation_not_met_library`
     ADD COLUMN `close_user` varchar(50) NULL COMMENT '关闭人' AFTER `all_approval_user`,
     ADD COLUMN `close_time` datetime NULL COMMENT '关闭时间' AFTER `close_user`;
+
+-- 2024-09-18 增加法规符合性评估库适用市场字段长度
+ALTER TABLE `laws_conformity_assessment_library`
+    MODIFY COLUMN `applicable_market` varchar(200) NULL DEFAULT NULL COMMENT '适用市场' AFTER `valuation_time`;
\ No newline at end of file

From c66ecc84de810e603d42fb983dd45438ac27bfee 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, 19 Sep 2024 14:11:25 +0800
Subject: [PATCH 07/14] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E6=9D=A1=E6=AC=BE=E9=80=82=E7=94=A8=E5=B8=82=E5=9C=BA=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=B7=B2=E5=8F=91=E5=B8=83=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/documenttool/mapper/xml/DocumentSplitMapper.xml  | 2 +-
 .../service/impl/DocumentSplitServiceImpl.java            | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
index 285b2043..b042d378 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/mapper/xml/DocumentSplitMapper.xml
@@ -320,7 +320,7 @@
     <select id="getSplitSelectIds" resultType="java.lang.String">
         select l2.id from laws_domestic_standard l1
         left join sar_file_split_info l2 on l1.id = l2.standard_id and l2.del_flag = 0
-        where l1.del_flag = 0 and l2.id is not null
+        where l1.del_flag = 0 and l2.id is not null and split_status = 2
         and
         <foreach collection="countryList" separator="or" item= "item" open="(" close=")">
             CONCAT(',',l1.applicable_market,',') like CONCAT('%,',#{item},',%')
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
index 77d58446..bde7c2cf 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/documenttool/service/impl/DocumentSplitServiceImpl.java
@@ -1879,10 +1879,12 @@ public class DocumentSplitServiceImpl implements IDocumentSplitService {
             // 查询市场下的标准
             List<String> countryList =  Arrays.asList(parameter.get(COUNTRY).toString().split(","));
             List<String> ids = documentSplitMapper.getSplitSelectIds(countryList);
-            if(!CollectionUtils.isEmpty(ids)){
-                // in查询
-                selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
+            if(CollectionUtils.isEmpty(ids)){
+                ids = new ArrayList<>();
+                ids.add("-1");
             }
+            // in查询
+            selectCondition.append(" and s.info_id" + " in('").append(String.join("','",ids)).append("')");
             parameter.remove(COUNTRY);
         }
     }

From d664514686fdba55b98cd785d9bc0183633f1c60 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, 19 Sep 2024 14:41:08 +0800
Subject: [PATCH 08/14] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B0=86/=E6=9B=BF=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../home/service/impl/LawsHomeSearchServiceImpl.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index 7aed79df..2a85b79f 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -76,6 +76,7 @@ import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 
@@ -1361,7 +1362,7 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
 
     private ModelAndView exportExcelByClause(Map<String, Object> parameterMap) {
         List<LawsHomeAdvancedSearchClauseVO> advancedSearchClause = getAdvancedSearchClauseExport(parameterMap);
-        List<Map<String, Object>> list = new ArrayList<>();
+        List<Map<String, Object>> list = new CopyOnWriteArrayList<>();
 
         // 标准sheet页
         List<LawsHomeAdvancedSearchStandardExcelVO> lawsHomeAdvancedSearchStandardExcelVOList =
@@ -1373,14 +1374,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
         standardSheet.put(NormalExcelConstants.PARAMS, exportParams);
         standardSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchStandardExcelVOList);
         list.add(standardSheet);
-
         for (LawsHomeAdvancedSearchClauseVO lawsHomeAdvancedSearchClauseVO : advancedSearchClause) {
             List<Map<String, Object>> clauseList = lawsHomeAdvancedSearchClauseVO.getClauseList();
             List<LawsHomeAdvancedSearchClauseExcelVO> lawsHomeAdvancedSearchClauseExcelVOS =
                     JSON.parseArray(JSON.toJSONString(clauseList), LawsHomeAdvancedSearchClauseExcelVO.class);
             // 条款详情
-            for (LawsHomeAdvancedSearchClauseExcelVO lawsHomeAdvancedSearchClauseExcelVO :
-                    lawsHomeAdvancedSearchClauseExcelVOS) {
+            lawsHomeAdvancedSearchClauseExcelVOS.parallelStream().forEach(lawsHomeAdvancedSearchClauseExcelVO->{
                 List<SarFileSplitItemsValEO> sarFileSplitItemsValEOS = sarFileSplitItemsValEOMapper.findList(
                         new QueryWrapper<SarFileSplitItemsValEO>()
                                 .eq("item_id", lawsHomeAdvancedSearchClauseExcelVO.getId())
@@ -1393,11 +1392,12 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
                             .collect(Collectors.joining("\n\r"));
                     lawsHomeAdvancedSearchClauseExcelVO.setItemContent(itemContents);
                 }
-            }
+            });
+
             // 条款sheet页
             Map<String, Object> clauseSheet = new HashMap<>();
             clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class);
-            ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber());
+            ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," "));
             exportParamss.setType(ExcelType.XSSF);
             clauseSheet.put(NormalExcelConstants.PARAMS, exportParamss);
             clauseSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchClauseExcelVOS);

From 7f6aafbf055bc902d64f745d85ae5a66f3484fbc 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, 19 Sep 2024 14:46:00 +0800
Subject: [PATCH 09/14] =?UTF-8?q?=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2?=
 =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=B0=86/\:=3F*[]=E6=9B=BF=E6=8D=A2=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../laws/home/service/impl/LawsHomeSearchServiceImpl.java   | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
index 2a85b79f..0619e989 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/home/service/impl/LawsHomeSearchServiceImpl.java
@@ -1397,7 +1397,11 @@ public class LawsHomeSearchServiceImpl implements ILawsHomeSearchService {
             // 条款sheet页
             Map<String, Object> clauseSheet = new HashMap<>();
             clauseSheet.put(NormalExcelConstants.CLASS, LawsHomeAdvancedSearchClauseExcelVO.class);
-            ExportParams exportParamss = new ExportParams(null, lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," "));
+            ExportParams exportParamss = new ExportParams(null,
+                    lawsHomeAdvancedSearchClauseVO.getStandardNumber().replace("/"," ")
+                            .replace("\\"," ").replace("?"," ")
+                            .replace("*"," ").replace("["," ")
+                            .replace("]"," ").replace(":"," "));
             exportParamss.setType(ExcelType.XSSF);
             clauseSheet.put(NormalExcelConstants.PARAMS, exportParamss);
             clauseSheet.put(NormalExcelConstants.DATA_LIST, lawsHomeAdvancedSearchClauseExcelVOS);

From 41f871dd412bdc647643fda52f6a2ad231dcd2e5 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, 19 Sep 2024 15:01:41 +0800
Subject: [PATCH 10/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=92=E5=BA=8F=E5=8F=B7bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 90974624..93b8b5c7 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
@@ -61,7 +61,7 @@
             ${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 CONCAT(max(REPLACE(manifest_no,#{str},'') * 1), '') as manifest_no from laws_market_standard where manifest_no like CONCAT(#{str},'%')
         <if test = "oldStr != null and oldStr != ''">
             and manifest_no &lt;> #{oldStr}
         </if>
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 e2c7b265..e5536939 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
@@ -247,8 +247,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(StringUtils.isBlank(manifestNo)){
             return s + "01";
         }
-        String num = manifestNo.substring(manifestNo.length() - 2);
-        int m = Integer.parseInt(num);
+        int m = Integer.parseInt(manifestNo);
         return s + (m >= 10 ? (m + 1) : "0" + (m + 1));
     }
 

From ac76837864ed229c0edc1d2c8948a6a75826706c 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, 19 Sep 2024 15:07:59 +0800
Subject: [PATCH 11/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=8E=92=E5=BA=8F=E5=8F=B7bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMarketStandardServiceImpl.java          | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

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 e5536939..175b6991 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
@@ -247,8 +247,9 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         if(StringUtils.isBlank(manifestNo)){
             return s + "01";
         }
-        int m = Integer.parseInt(manifestNo);
-        return s + (m >= 10 ? (m + 1) : "0" + (m + 1));
+        int m = Integer.parseInt(manifestNo) + 1;
+        String n = s + (m >= 10 ? m : "0" + m);
+        return n;
     }
 
     @Override

From 216d876f4ac235f30875dd2600e76f1ff92c23e7 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, 19 Sep 2024 15:12:08 +0800
Subject: [PATCH 12/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B8=85=E5=8D=95=E5=90=8D=E7=A7=B0=E5=B8=82?=
 =?UTF-8?q?=E5=9C=BA=E4=B9=8B=E9=97=B4=E6=B7=BB=E5=8A=A0=E9=A1=BF=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/LawsMarketStandardServiceImpl.java           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 175b6991..dba9b054 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
@@ -220,7 +220,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         List<DictModel> listDict = map.get(marketState);
         List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
         // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
-        manifest.setManifestName(String.join("",country) +
+        manifest.setManifestName(String.join("、",country) +
                 (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName())
                 + "车型需满足标准法规清单");
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -288,7 +288,7 @@ public class LawsMarketStandardServiceImpl extends ServiceImpl<LawsMarketStandar
         List<DictModel> listDict = map.get(marketState);
         List<String> country = listDict.stream().map(DictModel::getText).collect(Collectors.toList());
         // 国家/地区+自定义+固定字段，自定义字段：预留手填，当前默认不填；固定字段：车型需满足标准法规清单
-        manifest.setManifestName(String.join("",country) +
+        manifest.setManifestName(String.join("、",country) +
                 (StringUtils.isEmpty(manifest.getCustomColumnName()) ? "" : manifest.getCustomColumnName())
                 + "车型需满足标准法规清单");
         updateById(manifest);

From 9c5f04bde4b3c4f65b3b643ead20627b897d82e8 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, 19 Sep 2024 16:34:31 +0800
Subject: [PATCH 13/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/update/测试阶段.sql                        |  7 +-
 .../MarketStandardDetailController.java       | 16 ++++
 .../entity/LawsMarketStandardDetail.java      | 13 ++++
 .../ILawsMarketStandardDetailService.java     |  7 ++
 .../LawsMarketStandardDetailServiceImpl.java  | 73 +++++++++++++++++++
 .../src/main/resources/application-dev.yml    |  4 +-
 6 files changed, 117 insertions(+), 3 deletions(-)

diff --git a/db/update/测试阶段.sql b/db/update/测试阶段.sql
index 90e93f28..0d65d20e 100644
--- a/db/update/测试阶段.sql
+++ b/db/update/测试阶段.sql
@@ -397,4 +397,9 @@ ALTER TABLE sys_user_agent MODIFY COLUMN `sys_org_code` varchar(64) NULL COMMENT
 ALTER TABLE sys_user MODIFY COLUMN `type_id` varchar(64) NULL COMMENT '人员类型,000正式员工、002外部用户、001劳务工等';
 -- 2024-09-18 增加法规符合性评估库适用市场字段长度
 ALTER TABLE `laws_conformity_assessment_library`
-    MODIFY COLUMN `applicable_market` varchar(200) NULL DEFAULT NULL COMMENT '适用市场' AFTER `valuation_time`;
\ No newline at end of file
+    MODIFY COLUMN `applicable_market` varchar(200) NULL DEFAULT NULL COMMENT '适用市场' AFTER `valuation_time`;
+
+
+-- 2024-09-19 市场法规清单-标准添加排序号字段
+ALTER TABLE `laws_market_standard_detail`
+    ADD COLUMN `order_no` float NULL COMMENT '排序号';
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 4f9e39a4..8d17fba3 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
@@ -235,4 +235,20 @@ public class MarketStandardDetailController {
         return lawsMarketStandardDetailService.export(marketStandardDetail,request);
     }
 
+
+    /**
+     * 移动
+     *
+     * @param marketStandardDetail
+     * @return
+     */
+    @AutoLog(value = "外部标准库-市场法规清单-移动")
+    @ApiOperation(value = "外部标准库-市场法规清单-移动", notes = "外部标准库-市场法规清单-移动")
+    @PostMapping(value = "/move")
+    @ApiOperationSupport(order = 5)
+//    @RequiresPermissions("marketStandard:move")
+    public Result<?> move(@RequestBody LawsMarketStandardDetail marketStandardDetail) {
+        return lawsMarketStandardDetailService.move(marketStandardDetail);
+    }
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
index f0ee564d..3f0c15cc 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/entity/LawsMarketStandardDetail.java
@@ -247,4 +247,17 @@ public class LawsMarketStandardDetail implements Serializable {
     @ApiModelProperty(value = "清单版本")
     @TableField(exist = false)
     private String manifestVersion;
+
+    /**
+     * 排序号
+     */
+    @ApiModelProperty(value = "排序号")
+    private Float orderNo;
+
+    /**
+     * 移动标识 上移：up 下移：down
+     */
+    @ApiModelProperty(value = "移动标识")
+    @TableField(exist = false)
+    private String moveFlag;
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
index b4f4559d..3a4393d2 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/marketStandard/service/ILawsMarketStandardDetailService.java
@@ -110,4 +110,11 @@ public interface ILawsMarketStandardDetailService extends IService<LawsMarketSta
      * @return
      */
     ModelAndView export(LawsMarketStandardDetail marketStandardDetail, HttpServletRequest request);
+
+    /**
+     * 移动
+     * @param marketStandardDetail
+     * @return
+     */
+    Result<?> move(LawsMarketStandardDetail marketStandardDetail);
 }
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 7049ca79..372b1f72 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
@@ -3,6 +3,7 @@ package com.jero.modules.laws.marketStandard.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.api.vo.Result;
@@ -445,9 +446,21 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                     .collect(Collectors.toList());
             list = list.stream().filter(o->!listIds.contains(o.getStandardId())).collect(Collectors.toList());
         }
+        QueryWrapper<LawsMarketStandardDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("max(order_no) as order_no");
+        queryWrapper.eq("manifest_id",manifestId);
+        LawsMarketStandardDetail lawsMarketStandardDetail = getOne(queryWrapper,false);
+        float no = 0.0f;
+        if(!Objects.isNull(lawsMarketStandardDetail) && !Objects.isNull(lawsMarketStandardDetail.getOrderNo())){
+            no = lawsMarketStandardDetail.getOrderNo();
+        }
         if(CollectionUtils.isEmpty(list)){
             return Result.OK(ResultCommon.OK);
         }
+        no = no + 1;
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setOrderNo(no + i);
+        }
         // 更细状态
         marketStandardService.updateStatus(list.get(0).getManifestId());
         saveBatch(list);
@@ -687,6 +700,66 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         mv.addObject(NormalExcelConstants.DATA_LIST, res);
         return mv;
     }
+
+    @Override
+    public Result<?> move(LawsMarketStandardDetail marketStandardDetail) {
+        if(StringUtils.isBlank(marketStandardDetail.getManifestId()) ||
+                StringUtils.isBlank(marketStandardDetail.getId()) ||
+                StringUtils.isBlank(marketStandardDetail.getMoveFlag())){
+            return Result.error(ResultCommon.PARAMETER_NOT_RECOGNIZED);
+        }
+        LawsMarketStandard lawsMarketStandard = marketStandardService.getById(marketStandardDetail.getManifestId());
+        if(Objects.isNull(lawsMarketStandard)){
+            return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
+        LawsMarketStandardDetail lawsMarketStandardDetail = getById(marketStandardDetail.getId());
+        if(Objects.isNull(lawsMarketStandardDetail)){
+            return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
+        LambdaQueryWrapper<LawsMarketStandardDetail> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(LawsMarketStandardDetail::getManifestId,marketStandardDetail.getManifestId());
+        queryWrapper.orderByAsc(LawsMarketStandardDetail::getOrderNo);
+        queryWrapper.orderByDesc(LawsMarketStandardDetail::getCreateTime);
+        List<LawsMarketStandardDetail> list = list(queryWrapper);
+        if(CollectionUtils.isEmpty(list)){
+            return Result.error(ResultCommon.NO_CORRESPONDING_DATA_FOUND);
+        }
+        if(Objects.equals(marketStandardDetail.getMoveFlag(),"up")){
+            for (int i = 0; i < list.size(); i++) {
+                LawsMarketStandardDetail now = list.get(i);
+                if(Objects.equals(now.getId(),marketStandardDetail.getId()) && i > 0){
+                    LawsMarketStandardDetail last = list.get(i - 1);
+                    LambdaUpdateWrapper<LawsMarketStandardDetail> updateNow = new LambdaUpdateWrapper<>();
+                    updateNow.eq(LawsMarketStandardDetail::getId,now.getId());
+                    updateNow.set(LawsMarketStandardDetail::getOrderNo,last.getOrderNo());
+                    update(updateNow);
+
+                    LambdaUpdateWrapper<LawsMarketStandardDetail> updateLast = new LambdaUpdateWrapper<>();
+                    updateLast.eq(LawsMarketStandardDetail::getId,last.getId());
+                    updateLast.set(LawsMarketStandardDetail::getOrderNo,now.getOrderNo());
+                    update(updateLast);
+                }
+            }
+        }else if(Objects.equals(marketStandardDetail.getMoveFlag(),"down")){
+            for (int i = 0; i < list.size(); i++) {
+                LawsMarketStandardDetail now = list.get(i);
+                if(Objects.equals(now.getId(),marketStandardDetail.getId()) && (i != list.size() -1)){
+                    LawsMarketStandardDetail next = list.get(i + 1);
+                    LambdaUpdateWrapper<LawsMarketStandardDetail> updateNow = new LambdaUpdateWrapper<>();
+                    updateNow.eq(LawsMarketStandardDetail::getId,now.getId());
+                    updateNow.set(LawsMarketStandardDetail::getOrderNo,next.getOrderNo());
+                    update(updateNow);
+
+                    LambdaUpdateWrapper<LawsMarketStandardDetail> updateNext = new LambdaUpdateWrapper<>();
+                    updateNext.eq(LawsMarketStandardDetail::getId,next.getId());
+                    updateNext.set(LawsMarketStandardDetail::getOrderNo,now.getOrderNo());
+                    update(updateNext);
+                }
+            }
+        }
+
+        return Result.OK(ResultCommon.OK);
+    }
 }
 
 
diff --git a/laws-single-startup/src/main/resources/application-dev.yml b/laws-single-startup/src/main/resources/application-dev.yml
index b16a18c3..66025731 100644
--- a/laws-single-startup/src/main/resources/application-dev.yml
+++ b/laws-single-startup/src/main/resources/application-dev.yml
@@ -45,7 +45,7 @@ spring:
     job-store-type: jdbc
     initialize-schema: embedded
     #定时任务启动开关，true-开  false-关
-    auto-startup: true
+    auto-startup: false
     #启动时更新己存在的Job
     overwrite-existing-jobs: true
     properties:
@@ -147,7 +147,7 @@ spring:
         connectionProperties: druid.stat.mergeSql\=true;druid.stat.slowSqlMillis\=5000;druid.stat.logSlowSql\=true
       datasource:
         master:
-          url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev_init?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
+          url: jdbc:p6spy:mysql://10.10.10.44:3306/laws_chery_dev?characterEncoding=UTF-8&useUnicode=true&useSSL=false&tinyInt1isBit=false&allowPublicKeyRetrieval=true&serverTimezone=Asia/Shanghai&nullCatalogMeansCurrent=true
           username: root
           password: hzwlsoft.com
           driver-class-name: com.p6spy.engine.spy.P6SpyDriver

From 325b2c4832fe7fecee406cd0f1ab0f6ba36fec88 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, 19 Sep 2024 17:24:39 +0800
Subject: [PATCH 14/14] =?UTF-8?q?=E5=B8=82=E5=9C=BA=E6=B3=95=E8=A7=84?=
 =?UTF-8?q?=E6=B8=85=E5=8D=95=E6=B7=BB=E5=8A=A0=E6=8E=92=E5=BA=8F=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...ocessMarketStandardReleaseServiceImpl.java |  3 +-
 .../LawsMarketStandardDetailServiceImpl.java  | 61 +++++++++++++++----
 2 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
index 418d338c..98574c2b 100644
--- a/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/ms/service/impl/ProcessMarketStandardReleaseServiceImpl.java
@@ -304,7 +304,8 @@ public class ProcessMarketStandardReleaseServiceImpl extends ServiceImpl<Process
         if(!Objects.isNull(data)){
             LambdaQueryWrapper<LawsMarketStandardDetail> queryLawsMarketStandardDetail = new LambdaQueryWrapper<>();
             queryLawsMarketStandardDetail.eq(LawsMarketStandardDetail::getManifestId,data.getManifestId());
-            queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getId);
+            queryLawsMarketStandardDetail.orderByAsc(LawsMarketStandardDetail::getOrderNo);
+            queryLawsMarketStandardDetail.orderByDesc(LawsMarketStandardDetail::getCreateTime);
             List<LawsMarketStandardDetail> listLawsMarketStandardDetail = lawsMarketStandardDetailService.list(queryLawsMarketStandardDetail);
             if(!CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
                 data.setList(listLawsMarketStandardDetail);
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 372b1f72..7d8840d9 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
@@ -208,6 +208,22 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
             if(!StringUtils.isBlank(m.toString())){
                 return Result.error(m.toString());
             }
+            if(CollectionUtils.isEmpty(listLawsMarketStandardDetail)){
+                return Result.OK(ResultCommon.OK);
+            }
+
+            QueryWrapper<LawsMarketStandardDetail> queryWrapper = new QueryWrapper<>();
+            queryWrapper.select("max(order_no) as order_no");
+            queryWrapper.eq("manifest_id",manifestId);
+            LawsMarketStandardDetail lawsMarketStandardDetail = getOne(queryWrapper,false);
+            int no = 0;
+            if(!Objects.isNull(lawsMarketStandardDetail) && !Objects.isNull(lawsMarketStandardDetail.getOrderNo())){
+                no =  lawsMarketStandardDetail.getOrderNo().intValue();
+            }
+            no = no + 1;
+            for (int i = 0; i < listLawsMarketStandardDetail.size(); i++) {
+                listLawsMarketStandardDetail.get(i).setOrderNo((float)(no + i));
+            }
             // 更新状态
             marketStandardService.updateStatus(manifestId);
 
@@ -446,27 +462,33 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
                     .collect(Collectors.toList());
             list = list.stream().filter(o->!listIds.contains(o.getStandardId())).collect(Collectors.toList());
         }
-        QueryWrapper<LawsMarketStandardDetail> queryWrapper = new QueryWrapper<>();
-        queryWrapper.select("max(order_no) as order_no");
-        queryWrapper.eq("manifest_id",manifestId);
-        LawsMarketStandardDetail lawsMarketStandardDetail = getOne(queryWrapper,false);
-        float no = 0.0f;
-        if(!Objects.isNull(lawsMarketStandardDetail) && !Objects.isNull(lawsMarketStandardDetail.getOrderNo())){
-            no = lawsMarketStandardDetail.getOrderNo();
-        }
         if(CollectionUtils.isEmpty(list)){
             return Result.OK(ResultCommon.OK);
         }
-        no = no + 1;
-        for (int i = 0; i < list.size(); i++) {
-            list.get(i).setOrderNo(no + i);
-        }
+
+        setOrderData(list, manifestId);
         // 更细状态
         marketStandardService.updateStatus(list.get(0).getManifestId());
         saveBatch(list);
         return Result.OK(ResultCommon.OK);
     }
 
+    private void setOrderData(List<LawsMarketStandardDetail> list, String manifestId) {
+        QueryWrapper<LawsMarketStandardDetail> queryWrapper = new QueryWrapper<>();
+        queryWrapper.select("max(order_no) as order_no");
+        queryWrapper.eq("manifest_id", manifestId);
+        LawsMarketStandardDetail lawsMarketStandardDetail = getOne(queryWrapper, false);
+        int m = 0;
+        if (!Objects.isNull(lawsMarketStandardDetail) && !Objects.isNull(lawsMarketStandardDetail.getOrderNo())) {
+            m = lawsMarketStandardDetail.getOrderNo().intValue();
+        }
+
+        m = m + 1;
+        for (int i = 0; i < list.size(); i++) {
+            list.get(i).setOrderNo((float) (m + i));
+        }
+    }
+
     @Override
     public synchronized Result<?> copy(String oldId,String newId) {
         LawsMarketStandard lawsMarketStandard = marketStandardService.getById(newId);
@@ -508,6 +530,9 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         if(CollectionUtils.isEmpty(listOld)){
             return Result.OK(ResultCommon.OK);
         }
+
+        setOrderData(listOld, newId);
+
         // 更细状态
         marketStandardService.updateStatus(listOld.get(0).getManifestId());
         saveBatch(listOld);
@@ -562,7 +587,17 @@ public class LawsMarketStandardDetailServiceImpl extends ServiceImpl<LawsMarketS
         }
         // 更细状态
         marketStandardService.updateStatus(marketStandardDetail.getManifestId());
-
+        if(Objects.isNull(marketStandardDetail.getOrderNo())){
+            QueryWrapper<LawsMarketStandardDetail> query = new QueryWrapper<>();
+            query.select("max(order_no) as order_no");
+            query.eq("manifest_id",marketStandardDetail.getManifestId());
+            LawsMarketStandardDetail obj = getOne(query,false);
+            int m = 0;
+            if(!Objects.isNull(obj)){
+                m = obj.getOrderNo().intValue();
+            }
+            marketStandardDetail.setOrderNo((float) m);
+        }
         updateById(marketStandardDetail);
         return Result.OK(ResultCommon.OK);
     }