From 576c52d8d8e6fb1e738380cc5fc101a6a2b0b3a8 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期六, 04 九月 2021 16:00:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml | 11 +++++------
1 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml b/java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml
old mode 100644
new mode 100755
index 3786427..01635ba
--- a/java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml
@@ -84,9 +84,10 @@
<select id="getTaskInfo" parameterType="Map" resultType="Map">
select t.task_cron,t.task_cron taskCron,t.create_time,t.create_time createTime,t.task_name,t.task_name
taskName,t.status_cd,t.status_cd statusCd,t.state,t.b_id,t.b_id bId,t.template_id,t.template_id
- templateId,t.task_id,t.task_id taskId
- from task t
+ templateId,t.task_id,t.task_id taskId,tt.template_name templateName
+ from task t,task_template tt
where 1 =1
+ and t.template_id = tt.template_Id
<if test="taskCron !=null and taskCron != ''">
and t.task_cron= #{taskCron}
</if>
@@ -128,9 +129,6 @@
<if test="taskCron !=null and taskCron != ''">
, t.task_cron= #{taskCron}
</if>
- <if test="createTime !=null and createTime != ''">
- , t.create_time= #{createTime}
- </if>
<if test="taskName !=null and taskName != ''">
, t.task_name= #{taskName}
</if>
@@ -153,8 +151,9 @@
<!-- 鏌ヨ瀹氭椂浠诲姟鏁伴噺 add by wuxw 2018-07-03 -->
<select id="queryTasksCount" parameterType="Map" resultType="Map">
select count(1) count
- from task t
+ from task t,task_template tt
where 1 =1
+ and t.template_id = tt.template_Id
<if test="taskCron !=null and taskCron != ''">
and t.task_cron= #{taskCron}
</if>
--
Gitblit v1.8.0