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

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

@@ -387,12 +387,12 @@
             </if>
 
             <if test="itemsName != null and itemsName!=''">
-                and ITEMS_NAME=#{itemsName}
+                and ITEMS_NAME like CONCAT('%', #{itemsName},'%')
             </if>
-            <if test="XCXSSRQ !=null and XCXSSRQ!=''">
+            <if test="XCXSSRQ !=null">
                 and XCXSSRQ=#{XCXSSRQ}
             </if>
-            <if test="ZCCSSRQ !=null and ZCCSSRQ != ''">
+            <if test="ZCCSSRQ !=null">
                 and ZCCSSRQ=#{ZCCSSRQ}
             </if>
         </where>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardInfo.xml

@@ -17,7 +17,7 @@
     </resultMap>
 
     <!-- 查询条件 -->
-    <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
+    <select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
         SELECT
         info.ID,
         info.STAND_SORT,
@@ -31,12 +31,27 @@
         FROM
         sar_standards_info AS info
         JOIN sar_stand_attr_info AS attrInfo ON info.id = attrinfo.stand_id
-        WHERE
-              attrInfo.${str} BETWEEN #{date.startDate} and  #{date.endDate}
+        <where>
+            1=1
+            <if test="date!=null">
+                and
+                attrInfo.${str}
+                BETWEEN DATE_FORMAT( #{date.startDate},'%Y-%m-%d %H:%i:%s')
+                and DATE_FORMAT( #{date.endDate},'%Y-%m-%d %H:%i:%s')
+            </if>
+        </where>
+
+
+
 
     </select>
 
 
+    <update id="updateStandardInfo">
+        update sar_standards_info
+        set TEXT_STATUS=#{textStatus}
+        where ID=#{id}
+    </update>
 
 
 </mapper>

adc-da-slrs/src/main/resources/mybatis/mapper/sarStandWarning/SarStandardItem.xml

@@ -17,7 +17,7 @@
         <result column="ZRGCS" property="dutyEngineer"/>
     </resultMap>
     <!-- 查询条件 -->
-    <select id="select" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
+    <select id="selectWithinTerm" resultMap="resultMap" parameterType="com.adc.da.scheduled.entity.DataDTO">
         SELECT
             items.ID,
             STAND_ID,

adc-da-slrs/src/main/resources/mybatis/mapper/utArea/UtAreaMapper.xml

@@ -182,7 +182,7 @@
     </select>
 
     <select id="getAreaSelList" parameterType="com.adc.da.slrs.utArea.entity.UtArea" resultType="com.adc.da.sys.common.SelectionResult">
-        select id as value,area_name as label
+        select id as value,area_name as label,sar_type AS sarType
         from UT_AREA
         where 1=1
         <if test="id != null" >
@@ -191,6 +191,12 @@
         <if test="sarType != null" >
             and sar_type like concat(concat('%',#{sarType}),'%')
         </if>
+        <if test="sarTypeList != null" >
+            and sar_type in
+            <foreach collection="sarTypeList" index="index" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
+        </if>
         order by show_index,id
     </select>
 </mapper>