From 55d677758efadb6d42e6d4e595cecc2c50c20d5a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Sat, 23 Dec 2023 17:19:12 +0800
Subject: [PATCH] bug修复
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 115 +++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 106 insertions(+), 9 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 b323a6e..ceac40a 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -16,33 +16,130 @@
<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}
- <if test="task.status != null">
+ 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>
+ <if test="task.frequency != null and task.frequency != ''">
+ and jt.frequency = #{task.frequency}
</if>
<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>
+ <select id="selectTaskCount" resultType="int" parameterType="org.springblade.modules.task.vo.TaskVO">
+ SELECT count(1)
+ FROM
+ 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
+ WHERE
+ jgm.user_id = #{userId}
+ <if test="status != null">
+ and jt.status = #{status}
+ </if>
+ <if test="frequency != null">
+ and jt.frequency = #{frequency}
+ </if>
+ <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>
+ order by jt.create_time desc
+
+ </select>
+
+
+ <select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
+
+ SELECT
+ jt.* ,
+ jda.address_name
+ FROM
+ jczz_task jt
+ LEFT JOIN jczz_doorplate_address jda ON jt.house_code = jda.address_code
+ LEFT JOIN jczz_community jc ON jc.CODE = jda.nei_code
+ <where>
+ <if test="task.reportType != null and task.reportType != '' and task.reportType == 1">
+ AND jt.report_type = #{task.reportType}
+ </if>
+
+ <if test="task.reportType == null or task.reportType == ''">
+ AND jt.report_type in (2,3,6)
+ </if>
+ <if test="task.userId != null and task.userId != ''">
+ AND jc.res_police_user_id = #{task.userId}
+ </if>
+ </where>
+
+
+ </select>
+
+
</mapper>
--
Gitblit v1.9.3