From 43b6ab16ed0480a09dce7b7c5a3ecdfbef3e41a5 Mon Sep 17 00:00:00 2001
From: baizonghao <1719256278@qq.com>
Date: 星期六, 04 三月 2023 12:07:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml |   81 ++++++++++++++++++++++++++++++++++++----
 1 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index c73222b..7eb3d1d 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/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"
@@ -218,7 +243,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},'%')
@@ -254,14 +279,14 @@
     <select id="selectRegisterCount" resultType="java.lang.Long">
         select count(1)
         from ums_base_case
-        where state in (2, 6)
+        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
+        where state = 3
           and to_days(create_time) = TO_DAYS(now());
     </select>
 
@@ -337,13 +362,51 @@
     </select>
 
     <select id="selectType" resultType="com.ycl.vo.cockpit.enforcementEvents.VideoAndAreaVO">
-        SELECT
-            IFNULL( t2.`name`, "鍏朵粬" ) as name,
-            COUNT( 1 )  as count
+        SELECT IFNULL(t2.`name`, "鍏朵粬") as name,
+               COUNT(1) as count
         FROM
             ums_violations t1
-                LEFT JOIN ums_data_dictionary t2 ON t1.category_id = t2.id
+            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 &lt; limit_time
+    </select>
+
+    <select id="selectOnTimeCaseLastMonthCount" resultType="java.lang.Long">
+        SELECT COUNT(1) FROM ums_dispose_record WHERE end_time &lt; 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 &lt; 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