From 8d913e5594f45ca2a4ce656ea9feb99ffe715913 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期五, 29 十一月 2024 18:44:58 +0800
Subject: [PATCH] 代码提交

---
 smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
index 0019030..75c9356 100644
--- a/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
+++ b/smartor/src/main/resources/mapper/smartor/ServiceSubtaskMapper.xml
@@ -39,7 +39,7 @@
         <result property="pid" column="pid"/>
         <result property="guid" column="guid"/>
         <result property="textParam" column="text_param"/>
-        <result property="serviceform" column="serviceform"/>
+        <result property="preachform" column="preachform"/>
         <result property="bedNo" column="bed_no"/>
         <result property="sendType" column="send_type"/>
         <result property="taskName" column="task_name"/>
@@ -132,7 +132,7 @@
                pid,
                guid,
                text_param,
-               serviceform,
+               preachform,
                bed_no,
                send_type,
                task_name,
@@ -213,7 +213,7 @@
             <if test="uploadTime != null ">and upload_time = #{uploadTime}</if>
             <if test="orgid != null  and orgid != ''">and orgid = #{orgid}</if>
             <if test="pid != null ">and pid = #{pid}</if>
-            <if test="serviceform != null ">and serviceform = #{serviceform}</if>
+            <if test="preachform != null ">and preachform = #{preachform}</if>
             <if test="guid != null  and guid != ''">and guid = #{guid}</if>
             <if test="textParam != null  and textParam != ''">and text_param = #{textParam}</if>
             <if test="bedNo != null">and bed_no = #{bedNo}</if>
@@ -238,7 +238,12 @@
             <if test="remark != null">and remark = #{remark}</if>
             <if test="suggest != null">and suggest = #{suggest}</if>
         </where>
-        order by update_time desc,id desc
+        <if test="serviceType != null  and serviceType != ''and serviceType != '2'and serviceType != '3'">order by
+            long_send_time desc
+        </if>
+        <if test="serviceType != null  and serviceType != ''and serviceType == '2'">order by endtime desc</if>
+        <if test="serviceType != null  and serviceType != ''and serviceType == '3'">order by admindate desc</if>
+        -- order by update_time desc,id desc
     </select>
 
     <select id="selectServiceSubtaskById" parameterType="Long" resultMap="ServiceSubtaskResult">
@@ -280,7 +285,7 @@
             <if test="pid != null">pid,</if>
             <if test="guid != null">guid,</if>
             <if test="textParam != null">text_param,</if>
-            <if test="serviceform != null">serviceform,</if>
+            <if test="preachform != null">preachform,</if>
             <if test="bedNo != null">bed_no,</if>
             <if test="sendType != null  and sendType != ''">send_type,</if>
             <if test="taskName != null  and taskName != ''">task_name,</if>
@@ -350,7 +355,7 @@
             <if test="pid != null">#{pid},</if>
             <if test="guid != null">#{guid},</if>
             <if test="textParam != null">#{textParam},</if>
-            <if test="serviceform != null">#{serviceform},</if>
+            <if test="preachform != null">#{preachform},</if>
             <if test="bedNo != null">#{bedNo},</if>
             <if test="sendType != null  and sendType != ''">#{sendType},</if>
             <if test="taskName != null  and taskName != ''">#{taskName},</if>
@@ -424,7 +429,7 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
-            <if test="serviceform != null">serviceform = #{serviceform},</if>
+            <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
             <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
             <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
@@ -499,7 +504,7 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
-            <if test="serviceform != null">serviceform = #{serviceform},</if>
+            <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
             <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
             <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
@@ -575,7 +580,7 @@
             <if test="pid != null">pid = #{pid},</if>
             <if test="guid != null">guid = #{guid},</if>
             <if test="textParam != null">text_param = #{textParam},</if>
-            <if test="serviceform != null">serviceform = #{serviceform},</if>
+            <if test="preachform != null">preachform = #{preachform},</if>
             <if test="bedNo != null">bed_no = #{bedNo},</if>
             <if test="sendType != null  and sendType != ''">send_type = #{sendType},</if>
             <if test="taskName != null  and taskName != ''">task_name = #{taskName},</if>
@@ -669,7 +674,7 @@
                pid,
                guid,
                text_param,
-               serviceform,
+               preachform,
                bed_no,
                send_type,
                task_name,

--
Gitblit v1.9.3