Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

zhanghua

2023-03-08 32c350b8aca021b84125f1334f7a183a2defcbfd

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

@@ -75,6 +75,24 @@
            <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>

    </select>
@@ -151,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"