From a15053c7bdcc32ad41c6ccdfff16b5f53cc46e06 Mon Sep 17 00:00:00 2001
From: zhaoting <123456>
Date: Tue, 26 Nov 2024 14:56:52 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E8=BE=BE=E6=A2=A6=E7=9A=84=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/CallInformationMapper.xml          | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/CallInformationMapper.xml b/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/CallInformationMapper.xml
index a2f7154..472c0d5 100644
--- a/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/CallInformationMapper.xml
+++ b/city-sjdz-services-biz/city-sjdz-base/city-sjdz-base-biz/src/main/resources/mapper/CallInformationMapper.xml
@@ -34,19 +34,20 @@
 		call_information
 		<where>
 		<if test="keyWord!=null and keyWord!=''">
-			and (title like concat('%',#{keyWord},'%') or call_content like concat('%',#{keyWord},'%'))
+			and (title like  '%'|| #{keyWord}||'%'
+			or call_content like '%'|| #{keyWord}||'%'  )
 		</if>
 		<if test="area!=null and area!=''">
-			and area LIKE CONCAT('%', #{area}, '%')
+			and area  like '%'|| #{area}||'%'
 		</if>
 		<if test="time!=null and time!=''">
-				and DATE_FORMAT(report_time, '%Y-%m')>=#{time}
+			and  TO_CHAR(report_time, 'YYYY-MM')=#{time}
 		</if>
 		</where>
 		UNION ALL
 		select
 		ei.id as id,
-		"2" as type,
+		'2' as "type",
 		'群众反馈'as  call_type ,
 		ei.standard_event_title title,
 		ei.standard_event_content call_content,
@@ -63,16 +64,16 @@
 		where
 		ei.cancel_flag='0' and eie.del_flag='0'
 		<if test="keyWord!=null and keyWord!=''">
-			and (ei.standard_event_title like concat('%',#{keyWord},'%') or ei.standard_event_content like concat('%',#{keyWord},'%'))
+			and (ei.standard_event_title like '%' || #{keyWord}||'%' or ei.standard_event_content like '%'||#{keyWord}||'%')
 		</if>
 		<if test="time!=null and time!=''">
-			and DATE_FORMAT(ei.report_time, '%Y-%m')>=#{time}
+			and  TO_CHAR(ei.report_time, 'YYYY-MM')=#{time}
 		</if>
 		<if test="area!=null and area!=''">
-			and (eie.city_name LIKE CONCAT('%', #{area}, '%')
-			or eie.district_name LIKE CONCAT('%', #{area}, '%')
-			or eie.street_name LIKE CONCAT('%', #{area}, '%')
-			or eie.cell_name LIKE CONCAT('%', #{area}, '%')
+			and (eie.city_name LIKE '%' || #{area}||'%'
+			or eie.district_name LIKE '%' || #{area}||'%'
+			or eie.street_name LIKE '%' || #{area}||'%'
+			or eie.cell_name LIKE '%' || #{area}||'%'
 			or eie.community_name=#{area}
 			)
 		</if>
@@ -99,10 +100,10 @@
 		FROM call_information
 		<where>
 			<if test="area!=null and area!=''">
-				and area LIKE CONCAT('%', #{area}, '%')
+				and area LIKE '%'|| #{area} || '%'
 			</if>
 			<if test="time!=null and time!=''">
-				and DATE_FORMAT(report_time, '%Y-%m')>=#{time}
+				and  TO_CHAR(report_time, 'YYYY-MM')=#{time}
 			</if>
 		</where>
 		GROUP BY id
@@ -117,15 +118,15 @@
 		where
 		ei.cancel_flag='0' and eie.del_flag='0'  and ei.collection_mode=0
 		<if test="area!=null and area!=''">
-			and (eie.city_name LIKE CONCAT('%', #{area}, '%')
-			or eie.district_name LIKE CONCAT('%', #{area}, '%')
-			or eie.street_name LIKE CONCAT('%', #{area}, '%')
-			or eie.cell_name LIKE CONCAT('%', #{area}, '%')
+			and (eie.city_name LIKE '%'|| #{area} || '%'
+			or eie.district_name LIKE '%'|| #{area} || '%'
+			or eie.street_name LIKE '%'|| #{area} || '%'
+			or eie.cell_name LIKE '%'|| #{area} || '%'
 			or eie.community_name=#{area}
 			)
 		</if>
 		<if test="time!=null and time!=''">
-			and DATE_FORMAT(ei.report_time, '%Y-%m')>=#{time}
+			and  TO_CHAR(ei.report_time, 'YYYY-MM')>=#{time}
 		</if>
 		GROUP BY eie.id) aa
 	</select>
-- 
GitLab