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

zhanghua

2022-12-08 dd39d15b6b47679778df6a7041e7be01ddc3debd

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

@@ -127,13 +127,13 @@
        select t1.*,
        t3.region_name community_text
        from ums_base_case t1
        left join ums_sccg_region t3 on t1.street_id=t3.id
        left join ums_sccg_region t3 on t1.community_id=t3.id
        <where>
            <if test="categories != null">
                t1.category = #{categories}
            </if>
            <if test="streetId != null">
                and t1.street_id = #{streetId}
                and t1.community_id = #{streetId}
            </if>
            <if test="code != null and code !=''">
                and t1.code like concat('%',#{code},'%')
@@ -229,17 +229,17 @@
    </select>

    <select id="selectVideoInspection" resultType="com.ycl.vo.casePool.BaseCaseVO">
        SELECT t1.id         as baseId,
        SELECT t1.id            as baseId,
               t1.`code`,
               t3.`name`,
               t3.url_address,
               t3.longitude,
               t3.latitude,
               t4.pic_data,
               t5.`name`     as grade,
               t6.`region_name`     as street,
               t7.`region_name`     as community,
               t1.alarm_time as alarmTime
               t5.`name`        as grade,
               t6.`region_name` as street,
               t7.`region_name` as community,
               t1.alarm_time    as alarmTime
        FROM ums_base_case t1
                 LEFT JOIN ums_violations t2 ON t1.id = t2.id
                 LEFT JOIN ums_video_point t3 on t2.video_point_id = t3.id
@@ -263,35 +263,39 @@
    </select>
    <select id="dispatchCount" resultType="java.lang.Integer">
        select count(1)
        FROM
            ums_base_case t1
                LEFT JOIN ums_dispose_record t2 ON t1.id = t2.base_case_id
        WHERE
            t2.workflow_config_step_id =1
        FROM ums_base_case t1
                 LEFT JOIN ums_dispose_record t2 ON t1.id = t2.base_case_id
        WHERE t2.workflow_config_step_id = 1
    </select>
    <select id="alCount" resultType="java.lang.Integer">
        select count(1)
        FROM
            ums_base_case WHERE event_source=1;
        FROM ums_base_case
        WHERE event_source = 1;
    </select>
    <select id="selectEventList" resultType="com.ycl.vo.cockpit.enforcementEvents.EventVO">
        SELECT
            t1.alarm_time,
            ( CASE WHEN t1.event_source = 1 THEN "视频巡查" WHEN t1.event_source = 2 THEN "人工上报" ELSE "其他" END ) AS source,
            t1.site AS address,
            t2.description,
            t3.`name` AS point,
            t4.pic_data AS picture
        t1.alarm_time,
        t1.longitude,
        t1.latitude,
        ( CASE WHEN t1.category = 1 THEN "违规" WHEN t1.category = 2 THEN "违建" ELSE "其他" END ) AS type,
        ( CASE WHEN t1.event_source = 1 THEN "视频巡查" WHEN t1.event_source = 2 THEN "人工上报" ELSE "其他" END ) AS alarmAdvice,
        ( CASE WHEN t1.event_source = 1 THEN "视频巡查" WHEN t1.event_source = 2 THEN "人工上报" ELSE "其他" END ) AS source,
        t1.site AS address,
        t2.description,
        t3.`name` AS point,
        t4.pic_data AS picture
        FROM
            ums_base_case t1
                LEFT JOIN ums_violations t2 ON t1.id = t2.id
                LEFT JOIN ums_video_point t3 ON t3.id = t2.video_point_id
                LEFT JOIN ums_video_alarm_report t4 ON t4.id = t2.video_alarm_report_id
        ums_base_case t1
        LEFT JOIN ums_violations t2 ON t1.id = t2.id
        LEFT JOIN ums_video_point t3 ON t3.id = t2.video_point_id
        LEFT JOIN ums_video_alarm_report t4 ON t4.id = t2.video_alarm_report_id
        <where>
            t1.category=1
            <if test="beginTime !=''and beginTime!=null and endTime!=''and endTime!=null">
                t1.create_time BETWEEN #{beginTime}
              and  t1.create_time BETWEEN #{beginTime}
                AND #{endTime}
            </if>

        </where>

    </select>