From d7d9b601b2e4fdb663375993e2cfbdbd363df421 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 11 七月 2023 22:17:37 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml | 26 +++++++++++++++++++++++++-
1 files changed, 25 insertions(+), 1 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml
index dad121b..a512b3a 100644
--- a/java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/MaintainanceTaskV1ServiceDaoImplMapper.xml
@@ -24,8 +24,11 @@
authDesc,t.original_plan_user_id,t.original_plan_user_id originalPlanUserId,t.task_type,t.task_type
taskType,t.plan_id,t.plan_id planId,t.plan_end_time,t.plan_end_time
planEndTime,t.plan_user_name,t.plan_user_name planUserName,t.community_id,t.community_id
- communityId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId,t.mps_id,t.mps_id mpsId
+ communityId,t.act_user_id,t.act_user_id actUserId,t.task_id,t.task_id taskId,t.mps_id,t.mps_id mpsId,
+ mp.plan_name planName,td.`name` stateName
from maintainance_task t
+ left join maintainance_plan mp on t.plan_id = mp.plan_id and mp.status_cd = '0'
+ left join t_dict td on t.state = td.status_cd and td.table_name = 'maintainance_task' and td.table_columns = 'state'
where 1 =1
<if test="planUserId !=null and planUserId != ''">
and t.plan_user_id= #{planUserId}
@@ -77,6 +80,15 @@
</if>
<if test="mpsId !=null and mpsId != ''">
and t.mps_id= #{mpsId}
+ </if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="states !=null ">
+ and t.state in
+ <foreach collection="states" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
</if>
order by t.create_time desc
<if test="page != -1 and page != null ">
@@ -136,6 +148,9 @@
</if>
<if test="mpsId !=null and mpsId != ''">
, t.mps_id= #{mpsId}
+ </if>
+ <if test="state !=null and state != ''">
+ , t.state= #{state}
</if>
where 1=1
<if test="taskId !=null and taskId != ''">
@@ -200,6 +215,15 @@
<if test="mpsId !=null and mpsId != ''">
and t.mps_id= #{mpsId}
</if>
+ <if test="state !=null and state != ''">
+ and t.state= #{state}
+ </if>
+ <if test="states !=null ">
+ and t.state in
+ <foreach collection="states" item="item" open="(" close=")" separator=",">
+ #{item}
+ </foreach>
+ </if>
</select>
--
Gitblit v1.8.0