From a1b0e5c618b9cd1c2521be14beec70321232ec1d Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 11 十二月 2023 14:27:55 +0800
Subject: [PATCH] 删除注释
---
ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 insertions(+), 11 deletions(-)
diff --git a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
index 0d6f32d..472f35e 100644
--- a/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
+++ b/ycl-platform/src/main/resources/mapper/caseHandler/BaseCaseMapper.xml
@@ -135,7 +135,7 @@
and ubc.category=#{type}
</if>
</where>
-
+ order by ubc.id desc
</select>
@@ -162,16 +162,25 @@
<if test="categories != null">
t1.category = #{categories}
</if>
- <if test="streetId != null">
- and t1.community_id = #{streetId}
+ <if test="communityId != null">
+ and t1.community_id = #{communityId}
+ </if>
+ <if test=" streetId != null">
+ and t1.street_id = #{streetId}
</if>
<if test="code != null and code !=''">
and t1.code like concat('%',#{code},'%')
</if>
- <if test="site != null and site!=''">
+ <if test="code != null and code !=''">
+ and t1.code like concat('%',#{code},'%')
+ </if>
+ <if test="state != null and state!=''">
+ and t1.state =#{state}
+ </if>
+ <if test="site != null and site!=''">
and t1.site like concat('%',#{site},'%')
</if>
- <if test="startTime !='' and endTime !='' and startTime!=null and endTime !=null">
+ <if test="startTime!=null and endTime !=null">
and t1.create_time between #{startTime} and #{endTime}
</if>
</where>
@@ -255,6 +264,7 @@
and t1.handling_opinion like concat('%',#{queryForViolationParam.handlingOpinion},'%')
</if>
</where>
+ order by t1.id desc
</select>
@@ -272,7 +282,8 @@
t3.code as videoCode,
t1.alarm_time as alarmTime,
t1.alarm_time as currentAlarmTime,
- t4.algo_name as algoName
+ t4.algo_name as algoName,
+ t4.alarm_name as alarmName
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
@@ -287,6 +298,9 @@
</if>
<if test="beginTime!=null and beginTime!=''">
and t1.alarm_time between #{beginTime} and #{endTime}
+ </if>
+ <if test="type!=null">
+ and t3.type = #{type}
</if>
group by t1.id
order by t1.id desc
@@ -308,12 +322,12 @@
<select id="dayCount" resultType="java.lang.Integer">
SELECT
- count( 1 )
+ count(1)
FROM
ums_base_case
WHERE
- YEARWEEK(
- date_format( create_time, '%Y-%m-%d' )) = date_format( now(), '%Y-%m-%d' );
+ create_time BETWEEN CONCAT( CURDATE(), ' 00:00:00' )
+ AND CONCAT( CURDATE(), ' 23:59:59' );
</select>
<select id="weekCount" resultType="java.lang.Integer">
SELECT
@@ -322,8 +336,8 @@
ums_base_case
WHERE
YEARWEEK(
- date_format( create_time, '%Y-%m-%d' )) = YEARWEEK(
- now());
+ date_format( create_time, '%Y-%m-%d' ), 1) = YEARWEEK(
+ now(), 1);
</select>
<select id="dispatchCount" resultType="java.lang.Integer">
select count(1)
--
Gitblit v1.8.0