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/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/community/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/community/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml
index 3895f3e..b207b95 100644
--- a/java110-db/src/main/resources/mapper/community/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/community/MaintainanceTaskDetailV1ServiceDaoImplMapper.xml
@@ -23,10 +23,13 @@
machineName,t.act_user_name,t.act_user_name actUserName,t.task_detail_id,t.task_detail_id
taskDetailId,t.machine_id,t.machine_id machineId,t.point_start_time,t.point_start_time
pointStartTime,t.state,t.community_id,t.community_id communityId,t.act_user_id,t.act_user_id
- actUserId,t.task_id,t.task_id taskId,mp.plan_name planName,td.name stateName,mt.plan_user_name planUserName
+ actUserId,t.task_id,t.task_id taskId,mp.plan_name planName,td.name stateName,mt.plan_user_name planUserName,
+ ms.standard_name standardName,ms.standard_id standardId,mt.plan_end_time planEndTime,mt.plan_ins_time planInsTime,
+ t.create_time createTime,t.description
from maintainance_task_detail t
left join maintainance_task mt on t.task_id = mt.task_id and mt.status_cd = '0'
left join maintainance_plan mp on mt.plan_id = mp.plan_id and mp.status_cd = '0'
+ LEFT JOIN maintainance_standard ms on mp.standard_id = ms.standard_id and ms.status_cd = '0'
left join t_dict td on t.state = td.status_cd and td.table_name = 'maintainance_task_detail' and td.table_columns = 'state'
where 1 =1
<if test="sendFlag !=null and sendFlag != ''">
@@ -112,19 +115,23 @@
<if test="state !=null and state != ''">
, t.state= #{state}
</if>
+ <if test="description !=null and description != ''">
+ , t.description= #{description}
+ </if>
<if test="communityId !=null and communityId != ''">
, t.community_id= #{communityId}
</if>
<if test="actUserId !=null and actUserId != ''">
, t.act_user_id= #{actUserId}
</if>
- <if test="taskId !=null and taskId != ''">
- , t.task_id= #{taskId}
- </if>
+
where 1=1
<if test="taskDetailId !=null and taskDetailId != ''">
and t.task_detail_id= #{taskDetailId}
</if>
+ <if test="taskId !=null and taskId != ''">
+ and t.task_id= #{taskId}
+ </if>
</update>
--
Gitblit v1.8.0