From d40a69e7d455c12e32201330a9fbe22a7b6b4b5d Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期四, 29 十二月 2022 14:44:45 +0800
Subject: [PATCH] fix: 获取部门树为启用的
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 110 +++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 87 insertions(+), 23 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 0c4512f..a82df1a 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -63,8 +63,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">
+ <if test="state!=null and state!=6">
ubc.state=#{state}
+ </if>
+ <if test="state!=null and state==6">
+ ubc.state >=#{state}
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
@@ -95,8 +98,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 >=#{state}
</if>
<if test="resource!=null">
and ubc.event_source=#{resource}
@@ -187,7 +193,6 @@
LEFT JOIN ums_image_resources t8 on t8.belong_to_id=t1.id
LEFT JOIN ums_video_point t9 on t9.id=t2.video_point_id
<where>
- t1.state IN (7,8)
<if test="queryForViolationParam.eventSource != null">
and t1.event_source=#{queryForViolationParam.eventSource}
</if>
@@ -219,7 +224,7 @@
and t2.car_number like concat('%',#{queryForViolationParam.carNumber},'%')
</if>
<if test="queryForViolationParam.videoPointId != null">
- and t1.video_point_id=#{queryForViolationParam.videoPointId}
+ and t2.video_point_id=#{queryForViolationParam.videoPointId}
</if>
<if test="queryForViolationParam.handlingOpinion != null and queryForViolationParam.handlingOpinion !=''">
and t1.handling_opinion like concat('%',#{queryForViolationParam.handlingOpinion},'%')
@@ -229,16 +234,20 @@
</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,
+ t5.`name` as grade,
t3.address,
- t1.alarm_time as alarmTime
+ t3.plat_resource_id as platResourceId,
+ t3.code as videoCode,
+ t1.alarm_time as alarmTime,
+ t1.alarm_time as currentAlarmTime,
+ t4.algo_name as algoName
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
@@ -251,7 +260,15 @@
<select id="selectRegisterCount" resultType="java.lang.Long">
select count(1)
from ums_base_case
- where state in(2,6) and to_days(create_time) = TO_DAYS(now());
+ where state in (2, 6,7,8,9)
+ and to_days(create_time) = TO_DAYS(now());
+ </select>
+
+ <select id="selectStudyCount" resultType="java.lang.Long">
+ select count(1)
+ from ums_base_case
+ where state = 3
+ and to_days(create_time) = TO_DAYS(now());
</select>
<select id="dayCount" resultType="java.lang.Integer">
@@ -295,7 +312,7 @@
<where>
t1.category=1
<if test="beginTime !=''and beginTime!=null and endTime!=''and endTime!=null">
- and t1.create_time BETWEEN #{beginTime}
+ and t1.create_time BETWEEN #{beginTime}
AND #{endTime}
</if>
@@ -303,27 +320,74 @@
</select>
<select id="areaCount" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
- SELECT
- t2.region_name,
- COUNT( 1 ) AS count
+ SELECT t2.region_name,
+ COUNT(1) AS count
FROM
`ums_base_case` t1
- LEFT JOIN ums_sccg_region t2 ON t1.street_id = t2.id
+ LEFT JOIN ums_sccg_region t2
+ ON t1.street_id = t2.id
GROUP BY
street_id
</select>
<select id="selectDelayVOList" resultType="com.ycl.dto.cockpitManage.DelayDO">
- SELECT
- t1.`code`,
- t3.description,
- t2.start_time,
- t2.end_time,
- t2.limit_time
+ SELECT t1.`code`,
+ t3.description,
+ t2.start_time,
+ t2.end_time,
+ t2.limit_time
+ FROM `ums_base_case` t1
+ LEFT JOIN ums_dispose_record t2 ON t1.id = t2.base_case_id
+ LEFT JOIN ums_violations t3 on t1.id = t3.id
+ WHERE t2.workflow_config_step_id IN (1, 2)
+ </select>
+
+ <select id="selectType" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
+ SELECT IFNULL(t2.`name`, "鍏朵粬") as name,
+ COUNT(1) as count
FROM
- `ums_base_case` t1
- LEFT JOIN ums_dispose_record t2 ON t1.id = t2.base_case_id
- LEFT JOIN ums_violations t3 on t1.id=t3.id
- WHERE t2.workflow_config_step_id IN (1,2)
+ ums_violations t1
+ LEFT JOIN ums_data_dictionary t2
+ ON t1.category_id = t2.id
+ GROUP BY
+ t1.category_id
+ </select>
+
+ <select id="selectLastMonthCount" resultType="java.lang.Long">
+ SELECT
+ count(1)
+ FROM
+ ums_base_case
+ WHERE
+ state in
+ <foreach collection="list" open="(" separator="," close=")" item="state">
+ #{state}
+ </foreach>
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) =1
+ </select>
+
+ <select id="selectRecentlyMonthCount" resultType="java.lang.Long">
+ SELECT
+ count(1)
+ FROM
+ ums_base_case
+ WHERE
+ state in
+ <foreach collection="list" open="(" separator="," close=")" item="state">
+ #{state}
+ </foreach>
+ AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) =0
+ </select>
+
+ <select id="selectOnTimeCaseCount" resultType="java.lang.Long">
+ SELECT COUNT(1) FROM ums_dispose_record WHERE end_time < limit_time
+ </select>
+
+ <select id="selectOnTimeCaseLastMonthCount" resultType="java.lang.Long">
+ SELECT COUNT(1) FROM ums_dispose_record WHERE end_time < limit_time AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) =1
+ </select>
+
+ <select id="selectOnTimeCaseRecentlyMonthCount" resultType="java.lang.Long">
+ SELECT COUNT(1) FROM ums_dispose_record WHERE end_time < limit_time AND PERIOD_DIFF( date_format( now( ), '%Y%m' ), date_format( create_time, '%Y%m' ) ) =0
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0