feat: 体系搜索列表新排序规则（半成品2）

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(","));

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));
         }
 
         // 手动分页

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

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