Merge branch 'develop_migration' into 'develop_master'

Develop migration

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

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

@@ -6,19 +6,19 @@
     </resultMap>
 
     <sql id="Base_Column_List" >
-        ID,
-        STAND_ID,
-        STAND_NAME,
-        STAND_CODE,
-        REVIEW_TIME,
-        ISSUE_TIME,
-        REVIEW_RESULTS,
-        REVIEW_PROCESS_NUM,
-        CREATION_TIME,
-        MODIFY_TIME,
-        VALID_FLAG,
-        PARAM1,
-        PARAM2
+        sar_bussioness_stand_state.ID,
+        sar_bussioness_stand_state.STAND_ID,
+        sar_bussioness_stand_state.STAND_NAME,
+        sar_bussioness_stand_state.STAND_CODE,
+        sar_bussioness_stand_state.REVIEW_TIME,
+        sar_bussioness_stand_state.ISSUE_TIME,
+        sar_bussioness_stand_state.REVIEW_RESULTS,
+        sar_bussioness_stand_state.REVIEW_PROCESS_NUM,
+        sar_bussioness_stand_state.CREATION_TIME,
+        sar_bussioness_stand_state.MODIFY_TIME,
+        sar_bussioness_stand_state.VALID_FLAG,
+        sar_bussioness_stand_state.PARAM1,
+        sar_bussioness_stand_state.PARAM2
     </sql>
 
     <sql id="SarBussionInfoRole_Where_Clause_Review_Results_N">
@@ -75,6 +75,31 @@
         </trim>
     </sql>
 
+    <!-- 分页查询条件当页数据 -->
+    <select id="getSarBussionessStandStatePageNo" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
+        SELECT A.* FROM (
+        select
+            <include refid="Base_Column_List" />,
+            sar_buss_stand_attr_info.QCDW,
+            sar_buss_stand_attr_info.QCRBUSS
+        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
+        <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
+        ORDER BY
+        REVIEW_RESULTS ASC,
+        REVIEW_TIME DESC,
+        ISSUE_TIME DESC
+        ) A
+        limit ${pager.startIndex-1},${pageSize}
+    </select>
+
+    <select id="getBussionessStandStateCountNo" resultType="java.lang.Integer" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
+        select count(1) from (
+        select id from sar_bussioness_stand_state
+        <include refid="SarBussionInfoRole_Where_Clause_Review_Results_N"/>
+        ) a
+    </select>
+
     <!-- 分页查询条件当页数据 -->
     <select id="getBussionessStandStatePage" resultMap="BaseResultMap" parameterType="com.adc.da.slrs.sarBussionessStandState.entity.SarBussionessStandStatePage">
         SELECT A.* FROM (