Merge branch 'develop_migration' into 'develop_master'

feat: There is no way the, xxxxx

See merge request LiuChao/foton-slrs-system-rest!430

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandState.java

@@ -92,4 +92,7 @@ public class SarBussionessStandState extends BaseEntity {
     @TableField(exist = false)
     private String QCRBUSS;
 
+    @TableField(exist = false)
+    private String standSort;
+
 }

adc-da-slrs/src/main/java/com/adc/da/slrs/sarBussionessStandState/entity/SarBussionessStandStatePage.java

@@ -72,6 +72,7 @@ public class SarBussionessStandStatePage extends BasePage {
 
     private String QCDW;
     private String QCRBUSS;
+    private String standSort;
 
 
 }

adc-da-slrs/src/main/resources/mybatis/mapper/sarBussionessStandState/SarBussionessStandStateMapper.xml

@@ -77,13 +77,32 @@
 
     <!-- 分页查询条件当页数据 -->
     <select id="getSarBussionessStandStatePageNo" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
-        SELECT A.* FROM (
+        SELECT
+            A.ID,
+            A.STAND_ID,
+            A.STAND_NAME,
+            A.STAND_CODE,
+            A.REVIEW_TIME,
+            A.ISSUE_TIME,
+            A.REVIEW_RESULTS,
+            A.REVIEW_PROCESS_NUM,
+            A.CREATION_TIME,
+            A.MODIFY_TIME,
+            A.VALID_FLAG,
+            A.PARAM1,
+            A.PARAM2,
+            A.QCDW,
+            A.QCRBUSS,
+            A.standSort
+        FROM (
         select
             <include refid="Base_Column_List" />,
             sar_buss_stand_attr_info.QCDW,
-            sar_buss_stand_attr_info.QCRBUSS
+            sar_buss_stand_attr_info.QCRBUSS,
+            sar_bussioness_stand.stand_sort AS standSort
         from sar_bussioness_stand_state
         LEFT JOIN sar_buss_stand_attr_info ON sar_buss_stand_attr_info.stand_id = sar_bussioness_stand_state.stand_id
+        LEFT JOIN sar_bussioness_stand ON sar_bussioness_stand.id = sar_bussioness_stand_state.stand_id
         <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
         ORDER BY
         REVIEW_RESULTS ASC,