From 5d5cd3ad979a0b85ab8c7034dcad1663fdcf71be Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 01 Dec 2023 14:18:53 +0800
Subject: [PATCH] 文章通过范围查询
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
index 24d102f..04b8187 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -16,24 +16,36 @@
<result column="status" property="status"/>
<result column="is_deleted" property="isDeleted"/>
<result column="house_code" property="houseCode"/>
+ <result column="report_type" property="reportType"/>
</resultMap>
<select id="selectTaskPage" resultMap="taskResultMap">
SELECT
- jt.`status`,
- jt.`id`,
- jt.`name`,
- jt.frequency,
jda.address_name,
- jt.create_time
+ jt.id,
+ jt.name,
+ jt.type,
+ jt.frequency,
+ jt.remark,
+ jt.create_time,
+ jt.create_user,
+ jt.update_time,
+ jt.update_user,
+ jt.status,
+ jt.tenant_id,
+ jt.create_dept,
+ jt.is_deleted,
+ jt.house_code
FROM
- jczz_grid jg
+ jczz_gridman jgm
+ LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
- LEFT JOIN jczz_doorplate_address jda on jda.address_code=jt.house_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
WHERE
- jg.user_id = #{task.userId}
+ jgm.user_id = #{task.userId}
+ and jt.report_type in(2,3,4,5,6)
<if test="task.status != null and task.status != null">
and jt.status = #{task.status}
</if>
@@ -43,6 +55,26 @@
<if test="task.name != null and task.name != ''">
and jt.name like concat('%', #{task.name}, '%')
</if>
+ <if test="task.id != null ">and jt.id = #{task.id}</if>
+ <if test="task.type != null ">and jt.type = #{task.type}</if>
+ <if test="task.remark != null and task.remark != ''">and jt.remark = #{task.remark}</if>
+ <if test="task.createTime != null ">and jt.create_time = #{task.createTime}</if>
+ <if test="task.createUser != null ">and jt.create_user = #{task.createUser}</if>
+ <if test="task.updateTime != null ">and jt.update_time = #{task.updateTime}</if>
+ <if test="task.updateUser != null ">and jt.update_user = #{task.updateUser}</if>
+ <if test="task.tenantId != null and task.tenantId != ''">and jt.tenant_id = #{task.tenantId}</if>
+ <if test="task.createDept != null ">and jt.create_dept = #{task.createDept}</if>
+ <if test="task.isDeleted != null ">and jt.is_deleted = #{task.isDeleted}</if>
+ <if test="task.houseCode != null and task.houseCode != ''">and jt.house_code = #{task.houseCode}</if>
+ <!-- 取保候审 -->
+ <if test="task.reportType != null and task.reportType == 1 ">
+ and jt.report_type = 1
+ </if>
+ <!-- 场所店铺 -->
+ <if test="task.reportType != null and task.reportType == 2 ">
+ and jt.report_type in (2,3,4,5,6)
+ </if>
+
order by jt.create_time desc
</select>
@@ -51,12 +83,13 @@
<select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
SELECT count(1)
FROM
- jczz_grid jg
+ jczz_gridman jgm
+ LEFT JOIN jczz_grid jg ON jgm.grid_id = jg.id
LEFT JOIN jczz_grid_range jgr ON jg.id = jgr.grid_id
LEFT JOIN jczz_task jt ON jgr.house_code = jt.house_code
- LEFT JOIN jczz_doorplate_address jda on jda.address_code=jt.house_code
+ LEFT JOIN jczz_doorplate_address jda ON jda.address_code = jt.house_code
WHERE
- jg.user_id = #{userId}
+ jgm.user_id = #{userId}
<if test="status != null">
and jt.status = #{status}
</if>
@@ -66,6 +99,15 @@
<if test="type != null">
and jt.type = #{type}
</if>
+ <!-- 取保候审 -->
+ <if test="reportType != null and reportType == 1 ">
+ and jt.report_type = 1
+ </if>
+ <!-- 场所店铺 -->
+ <if test="reportType != null and reportType == 2 ">
+ and jt.report_type in (2,3,4,5,6)
+ </if>
+
<if test="name != null and name != ''">
and jt.name like concat('%', #{name}, '%')
</if>
--
Gitblit v1.9.3