From 9683dc8df6fa6fa14c0586f8fab8108fcb66513f Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 06 Jan 2024 09:14:47 +0800
Subject: [PATCH] 走访日志查询修改
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
index 84af111..7be4739 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -15,14 +15,43 @@
<result column="is_deleted" property="isDeleted"/>
</resultMap>
-
- <select id="selectGridWorkLogPage" resultMap="gridWorkLogResultMap">
- select * from jczz_grid_work_log where is_deleted = 0
+ <!--自定义分页查询-->
+ <select id="selectGridWorkLogPage" resultType="org.springblade.modules.grid.vo.GridWorkLogVO">
+ select
+ jgwl.*,
+ jh.name,jh.phone_number as phone,
+ if(jda.id is not null,jda.address_name,jh.current_address) as address,
+ jda.town_street_name AS townName,
+ jda.nei_name AS neiName,
+ jg.grid_name,
+ bu.real_name as createUserName
+ from jczz_grid_work_log jgwl
+ left join jczz_household jh on jgwl.household_id = jh.id and jh.is_deleted = 0
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jh.house_code
+ LEFT JOIN jczz_grid_range jgr on jgr.house_code=jda.address_code
+ LEFT JOIN jczz_grid jg on jg.id = jgr.grid_id and jg.is_deleted = 0
+ LEFT JOIN blade_user bu on bu.id = jgwl.create_user and bu.is_deleted = 0
+ where jgwl.is_deleted = 0
+ <if test="gridWorkLog.type !=null">
+ and jgwl.type = #{gridWorkLog.type}
+ </if>
+ <if test="gridWorkLog.personType !=null">
+ and jgwl.person_type = #{gridWorkLog.personType}
+ </if>
<if test="gridWorkLog.name !=null and gridWorkLog.name!=''">
- and name like concat('%',#{gridWorkLog.name},'%')
+ and jgwl.name like concat('%',#{gridWorkLog.name},'%')
</if>
<if test="gridWorkLog.phone !=null and gridWorkLog.phone!=''">
- and phone like concat('%',#{gridWorkLog.phone},'%')
+ and jgwl.phone like concat('%',#{gridWorkLog.phone},'%')
+ </if>
+ <if test="gridWorkLog.townName!=null and gridWorkLog.townName!=''">
+ and jda.town_street_name like concat('%',#{gridWorkLog.townName},'%')
+ </if>
+ <if test="gridWorkLog.neiName!=null and gridWorkLog.neiName!=''">
+ and jda.nei_name like concat('%',#{household.neiName},'%')
+ </if>
+ <if test="gridWorkLog.regionCode!=null and gridWorkLog.regionCode!=''">
+ and jg.community_code like concat('%',#{gridWorkLog.regionCode},'%')
</if>
</select>
--
Gitblit v1.9.3