Merge remote-tracking branch 'origin/develop_1' into develop_master

adc-da-slrs/src/main/resources/mybatis/mapper/SarStandItems/SarStandItemsMapper.xml

@@ -654,6 +654,20 @@
         </foreach>
         </if>
     </select>
+    <select id="selectStandTime" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
+        select STAND_ID,XCXSSRQ,ZCCSSRQ
+        from sar_stand_attr_info
+        where STAND_ID=#{standId,jdbcType=VARCHAR}
+    </select>
+    <select id="selectStandTimeAll" resultType="com.adc.da.slrs.sarStandItems.entity.StandsTimeDto">
+        select STAND_ID,XCXSSRQ,ZCCSSRQ
+        from sar_stand_attr_info
+    </select>
+    <select id="selectStandId" resultType="java.lang.String">
+        SELECT STAND_ID
+        FROM sar_stand_attr_info
+        group by STAND_ID limit #{page},#{size}
+    </select>
 
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarLawsAttrDetailedList/SarLawsAttrDetailedListMapper.xml

@@ -2,24 +2,21 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.adc.da.slrs.sarLawsAttrDetailedList.dao.SarLawsAttrDetailedListDao">
 
-    <select id="selectLawsById" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LittleLawsDto">
-        SELECT ID,STAND_NUMBER,STAND_NAME,STAND_EN_NAME,ISSUE_TIME,TEXT_STATUS
-        FROM sar_standards_info
+    <select id="selectLawsById" resultType="com.adc.da.slrs.sarLawsAttrDetailedList.entity.LawsDto">
+        SELECT a.ID,a.STAND_NUMBER,a.STAND_NAME,a.STAND_EN_NAME,b.NYLX,a.PUT_TIME,b.XCXSSRQGJ,b.ZCCSSRQGJ,b.ZRBM,b.SYCPX,b.CYCVPPSBM,b.CYCVPPSCN,b.KCCVPPSBM,b.KCCVPPSCN
+        FROM sar_standards_info a LEFT JOIN sar_stand_attr_info b on
+        a.ID = b.STAND_ID
         <where>
             <if test="standName != null">
-                (STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
-                or STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
+                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
                 and
             </if>
-            ID IN
+            a.ID IN
             <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
                 #{item}
             </foreach>
-            order by field(ID,
-            <foreach collection="param1" index="index" item="item" separator=",">
-                #{item}
-            </foreach>
-            )
+
         </where>
 
     </select>
@@ -45,6 +42,12 @@
         </where>
         order by number
     </select>
+    <select id="selectTypeApplicable" resultType="java.lang.String">
+        SELECT APPLY_ARCTIC
+        FROM sar_stand_items
+        WHERE ID =#{param1,jdbcType=VARCHAR}
+    </select>
+
 
     <insert id="insertList">
         INSERT INTO sar_laws_attr_detailed_list ( id, number, detailed_list_id, stand_id ) VALUES