From 590d573bf646f44f0608adcb89f04c576ec90e39 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 13 Aug 2024 19:49:22 +0800
Subject: [PATCH] 反诈宣传的优化
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 46 +++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 43 insertions(+), 3 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 da6df79..4ab88d5 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -11,6 +11,8 @@
br.town_name AS townName,
br.name AS neiName,
jg.grid_name,
+ juhl.label_name,
+ juhl.color,
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
@@ -19,6 +21,7 @@
LEFT JOIN blade_user bu on bu.id = jgwl.create_user and bu.is_deleted = 0
LEFT JOIN jczz_police_affairs_grid jpag on jhs.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 jczz_user_house_label juhl on juhl.label_id = jgwl.person_type
where jgwl.is_deleted = 0
<if test="gridWorkLog.type !=null">
and jgwl.type = #{gridWorkLog.type}
@@ -56,13 +59,13 @@
<if test="gridWorkLog.roleName=='wgy'">
<choose>
<when test="gridCodeList !=null and gridCodeList.size()>0">
- and jh.grid_code in
+ and jhs.grid_code in
<foreach collection="gridCodeList" item="code" open="(" close=")" separator=",">
#{code}
</foreach>
</when>
<otherwise>
- and jh.grid_code in ('')
+ and jhs.grid_code in ('')
</otherwise>
</choose>
</if>
@@ -106,6 +109,7 @@
</otherwise>
</choose>
</if>
+ order by jgwl.id desc
</select>
<!--走访日志数量统计-->
@@ -115,11 +119,47 @@
left join jczz_house jhs on jhs.house_code=jh.house_code and jhs.is_deleted = 0
where jgwl.is_deleted = 0
<if test="status!=null">
- and jgwl.status = #{status}
+ and (jgwl.status = #{status} or jgwl.status = 4)
</if>
<if test="gridCode!=null and gridCode!=''">
and jhs.grid_code = #{gridCode}
</if>
</select>
+
+ <select id="getDetail" resultType="org.springblade.modules.grid.vo.GridWorkLogVO">
+
+ SELECT
+ jgwl.id,
+ jgwl.type,
+ jgwl.person_type,
+ jgwl.household_id,
+ jgwl.context,
+ jgwl.url,
+ jgwl.work_time,
+ jgwl.source,
+ jgwl.status,
+ jgwl.create_time,
+ jgwl.create_user,
+ jgwl.is_deleted,
+ jl.label_name
+ FROM
+ jczz_grid_work_log jgwl
+ LEFT JOIN jczz_label jl ON jgwl.person_type = jl.id
+ <where>
+ <if test="id != null ">and jgwl.id = #{id}</if>
+ <if test="type != null ">and jgwl.type = #{type}</if>
+ <if test="personType != null ">and jgwl.person_type = #{personType}</if>
+ <if test="householdId != null ">and jgwl.household_id = #{householdId}</if>
+ <if test="context != null and context != ''">and jgwl.context = #{context}</if>
+ <if test="url != null and url != ''">and jgwl.url = #{url}</if>
+ <if test="workTime != null ">and jgwl.work_time = #{workTime}</if>
+ <if test="source != null ">and jgwl.source = #{source}</if>
+ <if test="status != null ">and jgwl.status = #{status}</if>
+ <if test="createTime != null ">and jgwl.create_time = #{createTime}</if>
+ <if test="createUser != null ">and jgwl.create_user = #{createUser}</if>
+ <if test="isDeleted != null ">and jgwl.is_deleted = #{isDeleted}</if>
+ </where>
+ </select>
+
</mapper>
--
Gitblit v1.9.3