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 | 10 +++++++++-
1 files changed, 9 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 87d00da..3b056d9 100644
--- a/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
+++ b/src/main/java/org/springblade/modules/police/mapper/PoliceAlarmRecordsMapper.xml
@@ -10,7 +10,8 @@
<select id="selectPoliceAlarmRecordsPage" resultMap="policeAlarmRecordsResultMap">
select
jpar.*,
- bdb.dict_value as alarmTypeName
+ 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
@@ -25,6 +26,10 @@
</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}
@@ -64,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 ('')
--
Gitblit v1.9.3