From a30d1d1271cbc54ecd59e440bf29c5447d332c15 Mon Sep 17 00:00:00 2001
From: caihaohan <caihaohan0712@foxmail.com>
Date: Tue, 5 Dec 2023 18:23:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BD=93=E7=B3=BB=E6=90=9C=E7=B4=A2?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E6=8E=92=E5=BA=8F=E8=A7=84=E5=88=99?=
 =?UTF-8?q?=EF=BC=88=E5=8D=8A=E6=88=90=E5=93=812=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java  | 6 ++++++
 .../service/impl/SarMenuStandardNewServiceNewImpl.java      | 4 +++-
 .../mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml      | 4 +++-
 .../mapper/sarBussionessStand/SarBussionessStandMapper.xml  | 4 +++-
 4 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
index 0e35b6f7..65b1a5c4 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/entity/StandSystemDTO.java
@@ -161,6 +161,12 @@ public class StandSystemDTO {
     @ApiModelProperty(value = "导出文件名称")
     private String exportName;
 
+    @ApiModelProperty(value = "标准号")
+    private String standNumber;
+
+    @ApiModelProperty(value = "年代号")
+    private String yearNumber;
+
     public void setSelectIds(String selectIds) {
         this.selectIds = selectIds;
         this.selectIdList = java.util.Arrays.asList(selectIds.split(","));
diff --git a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
index c96659d6..48b1e5cc 100644
--- a/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
+++ b/adc-da-slrs/src/main/java/com/adc/da/slrs/sarMenuStandard/service/impl/SarMenuStandardNewServiceNewImpl.java
@@ -334,7 +334,9 @@ public class SarMenuStandardNewServiceNewImpl extends ServiceImpl<SarMenuStandar
             // 每个类别的标准内部按照类别排序
             resultList.sort(Comparator.comparingInt(StandSystemDTO::getSystemSort)
                     .thenComparingInt(StandSystemDTO::getStandTypeSort)
-                    .thenComparingInt(StandSystemDTO::getStandCategorySort));
+                    .thenComparingInt(StandSystemDTO::getStandCategorySort)
+                    .thenComparing(StandSystemDTO::getStandNumber)
+                    .thenComparing(StandSystemDTO::getYearNumber));
         }
 
         // 手动分页
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
index bc301c9c..7e4d87c4 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/SarStandMenu/SarStandMenuMapper.xml
@@ -199,7 +199,9 @@
                 WHEN gb.STAND_TYPE = 'INLAND' THEN 1
                 WHEN gb.STAND_TYPE = 'FOREIGN' THEN 2
             END AS standTypeSort,
-            sms.ID AS menuId
+            sms.ID AS menuId,
+            gb.STAND_NUMBER AS standNumber,
+            gb.STAND_YEAR AS yearNumber
         FROM
             `sar_standards_info` AS gb
                 LEFT JOIN `sar_stand_attr_info` AS gba ON gb.ID = gba.STAND_ID
diff --git a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
index 4b4e1d5c..fbbc6ef0 100644
--- a/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
+++ b/adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStand/SarBussionessStandMapper.xml
@@ -1287,7 +1287,9 @@
             'ENTERPRISE' AS dataSource,
             sms.ID AS menuId,
             3 AS standTypeSort,
-            stand_sort AS standSort
+            es.stand_sort AS standSort,
+            es.stand_number AS standNumber,
+            es.STAND_YEAR AS yearNumber
         FROM
         `sar_bussioness_stand` AS es
         LEFT JOIN `sar_buss_stand_attr_info` AS esa ON es.ID = esa.STAND_ID