Merge remote-tracking branch 'origin/master'

fuliqi

2023-12-16 12ada3a7e6680d5ab92901410e3cedd9b8077e56

 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml

@@ -55,7 +55,8 @@
        t5.region_name as street,
        ubc.site,
        ubc.alarm_time,
        ubc.close_time
        ubc.close_time,
        ubc.state
        FROM
        `ums_base_case` AS ubc
        JOIN ums_violations AS uv ON ubc.id = uv.id
@@ -63,11 +64,11 @@
        LEFT JOIN ums_data_dictionary AS t4 ON uv.type_id = t4.id
        LEFT JOIN ums_sccg_region t5 ON ubc.street_id = t5.id
        <where>
            <if test="state!=null and state!=6">
                ubc.state=#{state}
            </if>
            <if test="state!=null and state==6">
                ubc.state &gt;=#{state}
            <if test=" state != null and state.size() > 0">
                AND ubc.state in
                <foreach collection="state" index="index" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            <if test="resource!=null">
                and ubc.event_source=#{resource}
@@ -115,18 +116,19 @@
        uib.building_width,
        uib.building_length,
        uib.building_area,
        uib.materials
        uib.materials,
        ubc.state
        FROM
        `ums_base_case` AS ubc
        left JOIN ums_illegal_building AS uib ON ubc.id = uib.base_case_id
        left JOIN ums_data_dictionary AS t1 ON uib.category_id = t1.id
        left JOIN ums_sccg_region t2 ON ubc.community_id = t2.id
        <where>
            <if test="state!=null and state!=6">
                ubc.state=#{state}
            </if>
            <if test="state!=null and state==6">
                ubc.state &gt;=#{state}
            <if test=" state != null and state.size() > 0">
                AND ubc.state in
                <foreach collection="state" index="index" item="item" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            <if test="resource!=null">
                and ubc.event_source=#{resource}