From 494aeb58eb885b40ab2fdb083aaa79007bb79ae2 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Fri, 19 Jan 2024 17:46:23 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/task/mapper/TaskMapper.xml | 47 +++++++++++++++++++++++++++++++----------------
1 files changed, 31 insertions(+), 16 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 595ec24..96da614 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"/>
@@ -27,8 +28,8 @@
jda.region_code,
jg.community_code neiCode,
jc.street_code streetCode,
- bu.name realName,
- bu.phone,
+ jp.principal as realName,
+ jp.principal_phone as phone,
jt.id,
jt.NAME,
jt.type,
@@ -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
@@ -63,8 +63,18 @@
LEFT JOIN jczz_gridman jgm ON jg.id = jgm.grid_id
WHERE
jg.is_deleted = 0
- <if test="task.communityCode != null and task.communityCode != ''">
- and jg.community_code = #{task.communityCode}
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jg.community_code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jg.community_code in ('')
+ </otherwise>
+ </choose>
</if>
AND jgm.user_id = #{task.userId} )
</if>
@@ -118,8 +128,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 != '' ">
@@ -187,13 +195,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
@@ -212,10 +218,22 @@
<if test="task.userId != null and task.userId != ''">
AND jc.res_police_user_id = #{task.userId}
</if>
+ <if test="isAdministrator==2">
+ <choose>
+ <when test="regionChildCodesList !=null and regionChildCodesList.size()>0">
+ and jc.code in
+ <foreach collection="regionChildCodesList" item="code" open="(" close=")" separator=",">
+ #{code}
+ </foreach>
+ </when>
+ <otherwise>
+ and jc.code in ('')
+ </otherwise>
+ </choose>
+ </if>
</where>
-
-
</select>
+
<select id="getBailReportingPage" resultType="org.springblade.modules.task.vo.TaskVO">
SELECT
IFNULL( jda.address_name, jp.location ) AS address_name,
@@ -236,8 +254,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
@@ -312,8 +329,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