Merge branch 'develop_migration' into 'develop_master'

Develop migration

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

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsItems/SarLawsItemsMapper.xml

@@ -35,6 +35,22 @@
         <result column="foShow" property="foShow"/>
     </resultMap>
 
+    <sql id="sarItemWhere">
+        <where>
+            <if test="standId!=null and standId!=''">
+                and laws_id=#{standId}
+            </if>
+
+            <if test="fileType !=null and fileType!=''">
+                and file_type=#{fileType}
+            </if>
+
+            <if test="itemsName != null and itemsName!=''">
+                and ITEMS_NAME like CONCAT('%', #{itemsName},'%')
+            </if>
+        </where>
+    </sql>
+
     <!-- SAR_LAWS_ITEMS table all fields -->
     <sql id="Base_Column_List">
      SAR_LAWS_ITEMS.modify_time, SAR_LAWS_ITEMS.creation_time, SAR_LAWS_ITEMS.creation_user, SAR_LAWS_ITEMS.valid_flag, SAR_LAWS_ITEMS.remarks, responsible_unit, energy_kind, apply_arctic, tack_time, parts, items_name, items_num, SAR_LAWS_ITEMS.laws_id,SAR_LAWS_ITEMS.id,SAR_LAWS_ITEMS.MAINPOINTS_IMPEMENTATION,SAR_LAWS_ITEMS.TERMS_CONDITIONS,
@@ -273,4 +289,17 @@
         </if>
     </delete>
 
+    <select id="querySarItemAndInterpretation" resultMap="BaseResultMap"
+            parameterType="com.adc.da.slrs.sarStandItems.entity.FindSarItemsPageReqDTO">
+        SELECT
+        SAR_LAWS_ITEMS.*,split_pid(SAR_LAWS_ITEMS.ITEMS_NUM,'.') as tt
+        FROM
+        SAR_LAWS_ITEMS
+        <include refid="sarItemWhere"/>
+        <if test="orderBy !=null and orderBy!=''">
+            order by tt ${order}
+        </if>
+        LIMIT ${pager.startIndex-1},${pageSize}
+    </select>
+
 </mapper>