From 8b7258c9427882bb1798f1502eaa35184c6e374e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 09 Aug 2024 14:29:18 +0800
Subject: [PATCH] 短信指定楼栋发送
---
src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml | 43 ++++++++++++++++++++++++++++++++++++++++---
1 files changed, 40 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..3a6433e 100644
--- a/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
+++ b/src/main/java/org/springblade/modules/grid/mapper/GridWorkLogMapper.xml
@@ -56,13 +56,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 +106,7 @@
</otherwise>
</choose>
</if>
+ order by jgwl.id desc
</select>
<!--走访日志数量统计-->
@@ -115,11 +116,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