Merge remote-tracking branch 'origin/master'

baizonghao

2023-03-04 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5

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

@@ -63,14 +63,35 @@
        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">
            <if test="state!=null and state!=6">
                ubc.state=#{state}
            </if>
            <if test="state!=null and state==6">
                ubc.state &gt;=#{state}
            </if>
            <if test="resource!=null">
                and ubc.event_source=#{resource}
            </if>
            <if test="type!=null">
                and ubc.category=#{type}
            </if>
            <if test="code!=null">
                and ubc.code=#{code}
            </if>
            <if test="categoryBig != null">
                and t3.name like concat('%', #{categoryBig},'%')
            </if>
            <if test="categorySmall != null">
                and t4.name like concat('%', #{categorySmall},'%')
            </if>
            <if test="street != null">
                and ubc.community_id = #{street}
            </if>
            <if test="site">
                and ubc.site like concat('%', #{site},'%')
            </if>
            <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
                and ubc.create_time between #{startTime} and #{endTime}
            </if>
        </where>

@@ -95,8 +116,11 @@
        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">
            <if test="state!=null and state!=6">
                ubc.state=#{state}
            </if>
            <if test="state!=null and state==6">
                ubc.state &gt;=#{state}
            </if>
            <if test="resource!=null">
                and ubc.event_source=#{resource}
@@ -145,6 +169,7 @@
                and t1.create_time between #{startTime} and #{endTime}
            </if>
        </where>
        order by t1.alarm_time desc
    </select>

    <select id="selectViolationPage" resultType="com.ycl.vo.casePool.QueryForViolationVO"