From 764d883b5ea3bdc06abbec548b6df0511e567978 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Sep 2024 09:46:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/binlog' into binlog
---
src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 deletions(-)
diff --git a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
index 0fab254..3b056d9 100644
--- a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -8,10 +8,15 @@
<select id="selectPoliceAlarmRecordsPage" resultMap="policeAlarmRecordsResultMap">
- select jpar.* from jczz_police_alarm_records jpar
+ select
+ jpar.*,
+ bdb.dict_value as alarmTypeName,
+ jpag.pcs_name
+ from jczz_police_alarm_records jpar
LEFT JOIN jczz_grid jg on jg.grid_code = jpar.grid_code and jg.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jpar.jw_grid_code= jpag.jw_grid_code and jpag.is_deleted = 0
LEFT JOIN blade_region br on br.code = jpag.community_code
+ LEFT JOIN blade_dict_biz bdb ON bdb.dict_key = jpar.alarm_type and bdb.is_deleted = 0 and bdb.code = 'applyAlarmType'
<where>
<if test="vo.status != null">
and jpar.status = #{vo.status}
@@ -21,6 +26,25 @@
</if>
<if test="vo.policeName != null and vo.policeName != ''">
and jpar.police_name like concat('%',#{vo.policeName},'%')
+ </if>
+
+ <if test="vo.pcsName != null and vo.pcsName != ''">
+ and jpag.pcs_name like concat('%',#{vo.pcsName},'%')
+ </if>
+ <if test="vo.startTime != null and vo.startTime != ''">
+ and date_format(jpar.create_time,'%Y-%m-%d') >= #{vo.startTime}
+ </if>
+ <if test="vo.endTime != null and vo.endTime != ''">
+ and date_format(jpar.create_time,'%Y-%m-%d') <= #{vo.endTime}
+ </if>
+ <if test="vo.searchKey!=null and vo.searchKey!=''">
+ and CONCAT(
+ ifnull(jpar.name,''),
+ ifnull(jpar.phone,''),
+ ifnull(jpar.address,''),
+ ifnull(jpar.alarm_describe,''),
+ ifnull(jpar.police_name,'')
+ ) like CONCAT ('%', #{vo.searchKey},'%')
</if>
<if test="isAdministrator==2">
<choose>
@@ -45,6 +69,9 @@
<foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
+ <if test="vo.policeId != null">
+ or jpar.police_id = #{vo.policeId}
+ </if>
</when>
<otherwise>
and jpag.community_code in ('')
@@ -80,6 +107,7 @@
</if>
and jpar.is_deleted = 0
</where>
+ order by jpar.id desc,jpar.create_time desc
</select>
<resultMap type="org.springblade.modules.police.dto.PoliceAlarmRecordsDTO" id="PoliceAlarmRecordsDTOResult">
--
Gitblit v1.9.3