wenhongquan 2 anni fa
parent
commit
a9e87b0e7b

+ 6 - 0
ruoyi-system/src/main/resources/mapper/system/TableDetectionMapper.xml

@@ -41,7 +41,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="facilitiesId != null "> and facilities_id = #{facilitiesId}</if>
             <if test="ext1 != null  and ext1 != ''"> and ext1 = #{ext1}</if>
             <if test="ext2 != null  and ext2 != ''"> and ext2 = #{ext2}</if>
+            <if test="params.status != null and params.status != ''"><!-- 结束时间检索 -->
+                and status in (${params.status})
+            </if>
 
+            <if test="params.area != null and params.area != ''"><!-- 结束时间检索 -->
+                and facilities_id in (select id from tbl_facilities where ext1->'$.tz_area_new' = #{params.area})
+            </if>
             <if test="params.facilities_unit != null and params.facilities_unit != ''"><!-- 结束时间检索 -->
                 and ext1->'$.facilities_unit' =  #{params.facilities_unit}
             </if>

+ 3 - 0
ruoyi-system/src/main/resources/mapper/system/TblMaintainMapper.xml

@@ -47,6 +47,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.facilities_unit != null and params.facilities_unit != ''"><!-- 结束时间检索 -->
                 and ext1->'$.facilities_unit' =  #{params.facilities_unit}
             </if>
+            <if test="params.status != null and params.status != ''"><!-- 结束时间检索 -->
+                and status in (${params.status})
+            </if>
             <if test="params.searchkey != null  and params.searchkey != ''"> and  ( ext1->'$.facilities_road' like  concat('%', #{params.searchkey}, '%') or ext1->'$.facilities_name' like concat('%', #{params.searchkey}, '%') )</if>
             <if test="params.beginTime != null and params.beginTime != ''"><!-- 开始时间检索 -->
                 and date_format(CONCAT(ext1->>'$.task.datestart','-01'),'%Y%m%d') &gt;= date_format(#{params.beginTime},'%Y%m%d')