From 4ec472d8828e34fbcfb3990451d059e486b7d5ea Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 17 Jan 2024 19:32:46 +0800
Subject: [PATCH] 议事管理bug
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 20 ++++++++------------
1 files changed, 8 insertions(+), 12 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 735544d..57d4cb4 100644
--- a/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
+++ b/src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml
@@ -14,6 +14,7 @@
<result column="update_time" property="updateTime"/>
<result column="update_user" property="updateUser"/>
<result column="status" property="status"/>
+ <result column="source" property="source"/>
<result column="is_deleted" property="isDeleted"/>
<result column="house_code" property="houseCode"/>
<result column="report_type" property="reportType"/>
@@ -39,8 +40,7 @@
jt.update_time,
jt.update_user,
jt.STATUS,
- jt.tenant_id,
- jt.create_dept,
+ jt.source,
jt.is_deleted,
jt.house_code,
jt.report_type
@@ -81,6 +81,10 @@
and jg.community_code = #{task.neiCode}
</if>
+ <if test="task.communityName != null and task.communityName != null">
+ and jc.name like concat('%', #{task.communityName}, '%')
+ </if>
+
<if test="task.streetCode != null and task.streetCode != null">
and jc.street_code = #{task.streetCode}
</if>
@@ -114,8 +118,6 @@
<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.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
@@ -183,13 +185,11 @@
AND jgm.user_id = #{userId} )
</if>
</where>
-
order by jt.create_time desc
</select>
<select id="selectTaskPageBy" resultType="org.springblade.modules.task.vo.TaskVO">
-
SELECT
jt.* ,
jda.address_name
@@ -209,9 +209,8 @@
AND jc.res_police_user_id = #{task.userId}
</if>
</where>
-
-
</select>
+
<select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
SELECT
IFNULL( jda.address_name, jp.location ) AS address_name,
@@ -232,8 +231,7 @@
jt.update_time,
jt.update_user,
jt.STATUS,
- jt.tenant_id,
- jt.create_dept,
+ jt.source,
jt.is_deleted,
jt.house_code,
jt.report_type
@@ -308,8 +306,6 @@
<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.startTime != null and task.startTime != '' and task.endTime != null and task.endTime != '' ">
--
Gitblit v1.9.3