From a20310f135ebf1c8ccff2b619f3eff3d704436a0 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期四, 08 十二月 2022 13:12:03 +0800
Subject: [PATCH] Merge branch 'xinghong-dev' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml |   43 +++++++++++++------------------------------
 1 files changed, 13 insertions(+), 30 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 01635ba..278d3df
--- a/java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml
+++ b/java110-db/src/main/resources/mapper/job/TaskServiceDaoImplMapper.xml
@@ -1,18 +1,13 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<!DOCTYPE mapper
-        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="taskServiceDaoImpl">
 
     <!-- 淇濆瓨瀹氭椂浠诲姟淇℃伅 add by wuxw 2018-07-03 -->
     <insert id="saveBusinessTaskInfo" parameterType="Map">
-        insert into business_task(
-        operate,task_cron,task_name,state,b_id,template_id,task_id
-        ) values (
-        #{operate},#{taskCron},#{taskName},#{state},#{bId},#{templateId},#{taskId}
-        )
+        insert into business_task(operate, task_cron, task_name, state, b_id, template_id, task_id)
+        values (#{operate}, #{taskCron}, #{taskName}, #{state}, #{bId}, #{templateId}, #{taskId})
     </insert>
-
 
     <!-- 鏌ヨ瀹氭椂浠诲姟淇℃伅锛圔usiness锛� add by wuxw 2018-07-03 -->
     <select id="getBusinessTaskInfo" parameterType="Map" resultType="Map">
@@ -44,9 +39,7 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
     </select>
-
 
     <!-- 淇濆瓨瀹氭椂浠诲姟淇℃伅鑷� instance琛ㄤ腑 add by wuxw 2018-07-03 -->
     <insert id="saveTaskInfoInstance" parameterType="Map">
@@ -76,9 +69,7 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
     </insert>
-
 
     <!-- 鏌ヨ瀹氭椂浠诲姟淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getTaskInfo" parameterType="Map" resultType="Map">
@@ -95,7 +86,7 @@
             and t.create_time= #{createTime}
         </if>
         <if test="taskName !=null and taskName != ''">
-            and t.task_name= #{taskName}
+            and t.task_name like '%${taskName}%'
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -109,6 +100,9 @@
         <if test="templateId !=null and templateId != ''">
             and t.template_id= #{templateId}
         </if>
+        <if test="templateName != null and templateName != ''">
+            and tt.template_name like '%${templateName}%'
+        </if>
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
@@ -116,9 +110,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 淇敼瀹氭椂浠诲姟淇℃伅 add by wuxw 2018-07-03 -->
     <update id="updateTaskInfoInstance" parameterType="Map">
@@ -145,7 +137,6 @@
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
     </update>
 
     <!-- 鏌ヨ瀹氭椂浠诲姟鏁伴噺 add by wuxw 2018-07-03 -->
@@ -161,7 +152,7 @@
             and t.create_time= #{createTime}
         </if>
         <if test="taskName !=null and taskName != ''">
-            and t.task_name= #{taskName}
+            and t.task_name like '%${taskName}%'
         </if>
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
@@ -175,13 +166,13 @@
         <if test="templateId !=null and templateId != ''">
             and t.template_id= #{templateId}
         </if>
+        <if test="templateName != null and templateName != ''">
+            and tt.template_name like '%${templateName}%'
+        </if>
         <if test="taskId !=null and taskId != ''">
             and t.task_id= #{taskId}
         </if>
-
-
     </select>
-
 
     <!-- 鏌ヨ瀹氭椂浠诲姟鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryTaskTemplateCount" parameterType="Map" resultType="Map">
@@ -200,13 +191,12 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
-
     </select>
-
 
     <!-- 鏌ヨ瀹氭椂浠诲姟淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getTaskTemplateInfo" parameterType="Map" resultType="Map">
-        select t.template_id templateId,t.template_name templateName,t.template_desc templateDesc,t.create_time createTime,t.class_bean classBean
+        select t.template_id templateId,t.template_name templateName,t.template_desc templateDesc,t.create_time
+        createTime,t.class_bean classBean
         from task_template t
         where 1 =1
         <if test="templateId !=null and templateId != ''">
@@ -225,9 +215,7 @@
         <if test="page != -1 and page != null ">
             limit #{page}, #{row}
         </if>
-
     </select>
-
 
     <!-- 鏌ヨ瀹氭椂浠诲姟鏁伴噺 add by wuxw 2018-07-03 -->
     <select id="queryTaskTemplateSpecCount" parameterType="Map" resultType="Map">
@@ -249,9 +237,7 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
-
     </select>
-
 
     <!-- 鏌ヨ瀹氭椂浠诲姟淇℃伅 add by wuxw 2018-07-03 -->
     <select id="getTaskTemplateSpecInfo" parameterType="Map" resultType="Map">
@@ -274,8 +260,5 @@
         <if test="statusCd !=null and statusCd != ''">
             and t.status_cd= #{statusCd}
         </if>
-
     </select>
-
-
 </mapper>

--
Gitblit v1.8.0