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

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

@@ -671,6 +671,7 @@
         LEFT JOIN sar_standards_info b
         on a.STAND_ID=b.ID
         WHERE b.VALID_FLAG = 0
+        and a.FILE_TYPE ='FBGBJBD'
         GROUP BY
             a.STAND_ID
             limit #{page},#{size}

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

@@ -15,8 +15,7 @@
             a.ID IN
             <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
                 #{item}
-            </foreach>
-
+            </foreach
         </where>
 
     </select>
@@ -47,6 +46,25 @@
         FROM sar_stand_items
         WHERE ID =#{param1,jdbcType=VARCHAR}
     </select>
+    <select id="selectLawsByIdC" 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">
+                (a.STAND_NUMBER LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%')
+                or a.STAND_NAME LIKE concat ('%',#{standName,jdbcType=VARCHAR},'%'))
+                and
+            </if>
+        <if test="standType !=null">
+            a.STAND_TYPE = #{standType} and
+        </if>
+            a.ID IN
+            <foreach collection="param1" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </where>
+    </select>
 
 
     <insert id="insertList">