From 6b6450c6fc002518f738f00d655ad64fd17db578 Mon Sep 17 00:00:00 2001
From: lroyia <lirh@chinaweal.com.cn>
Date: Wed, 15 Apr 2026 14:38:02 +0800
Subject: [PATCH] =?UTF-8?q?=E6=88=91=E7=9A=84=E4=B8=80=E8=88=AC=E9=87=8D?=
 =?UTF-8?q?=E5=A4=8D=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aiccs/business/TSTaskListMapper.xml       | 36 +++++++++----------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
index 5d5e045..199550c 100644
--- a/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
+++ b/src/main/resources/mybatis/mapper/aiccs/business/TSTaskListMapper.xml
@@ -717,17 +717,17 @@
             )
             ) m
         ) mm
-        WHERE mm.rn = 1
         <where>
+            mm.rn = 1
             <if test="customParamMap != null">
                 <if test="customParamMap.startDate != null and customParamMap.startDate != '' ">
-                    and date_format(m.CREATETIME,'%Y-%m-%d') &gt;= #{customParamMap.startDate}
+                    AND date_format(mm.CREATETIME,'%Y-%m-%d') &gt;= #{customParamMap.startDate}
                 </if>
                 <if test="customParamMap.endDate != null and customParamMap.endDate != '' ">
-                    and date_format(m.CREATETIME,'%Y-%m-%d') &lt;= #{customParamMap.endDate}
+                    AND date_format(mm.CREATETIME,'%Y-%m-%d') &lt;= #{customParamMap.endDate}
                 </if>
                 <if test="customParamMap.UNISCID and customParamMap.UNISCID != '' ">
-                    and m.BIZSEQID in (
+                    AND mm.BIZSEQID in (
                     select BIZSEQ from aiccs.tsbizremlist tsb left join e_baseinfo eb on tsb.PRIPID = eb.PRIPID
                     where 1=1
                     and eb.UNISCID = #{customParamMap.UNISCID}
@@ -739,7 +739,7 @@
                     )
                 </if>
                 <if test="customParamMap.REGNO and customParamMap.REGNO != '' ">
-                    and m.BIZSEQID in (
+                    AND mm.BIZSEQID in (
                     select BIZSEQ from aiccs.tsbizremlist tsb left join e_baseinfo eb on tsb.PRIPID = eb.PRIPID
                     where 1=1
                     and eb.REGNO = #{customParamMap.REGNO}
@@ -751,22 +751,22 @@
                     )
                 </if>
                 <if test="customParamMap.bustype != null and customParamMap.bustype != '' ">
-                    and m.BUSTYPE = #{customParamMap.bustype}
+                    AND mm.BUSTYPE = #{customParamMap.bustype}
                 </if>
                 <if test="customParamMap.searchName != null and customParamMap.searchName != '' ">
-                    and m.BUSNAME = #{customParamMap.searchName}
+                    AND mm.BUSNAME = #{customParamMap.searchName}
                 </if>
                 <if test="customParamMap.acceptno != null and customParamMap.acceptno != '' ">
-                    and m.ACCEPTNO = #{customParamMap.acceptno}
+                    AND mm.ACCEPTNO = #{customParamMap.acceptno}
                 </if>
                 <if test="customParamMap.currentNode != null and customParamMap.currentNode != '' ">
-                    and m.currentNodeOrBizStatus = #{customParamMap.currentNode}
+                    AND mm.currentNodeOrBizStatus = #{customParamMap.currentNode}
                 </if>
                 <if test="customParamMap.lastNode != null and customParamMap.lastNode != '' ">
-                    and m.lastNode = #{customParamMap.lastNode}
+                    AND mm.lastNode = #{customParamMap.lastNode}
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '1'.toString() ">
-                    and m.currentNodeOrBizStatus in ('exptlistEnter',
+                    AND mm.currentNodeOrBizStatus in ('exptlistEnter',
                     'serIllegalEnter',
                     'revCancelEnter',
                     'startAccept',
@@ -779,7 +779,7 @@
                     )
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '2'.toString() ">
-                    and m.currentNodeOrBizStatus in ('handleExptlist',
+                    AND mm.currentNodeOrBizStatus in ('handleExptlist',
                     'handleSerIllegal',
                     'handleRevCancel',
                     'handleCancel',
@@ -798,7 +798,7 @@
                     )
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '3'.toString() ">
-                    and m.currentNodeOrBizStatus in ( 'approvelist',
+                    AND mm.currentNodeOrBizStatus in ( 'approvelist',
                     'approveSerIllegal',
                     'approveRevCancel',
                     'approvalCancel',
@@ -817,7 +817,7 @@
                     )
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '4'.toString() ">
-                    and m.currentNodeOrBizStatus in ('endExptlist',
+                    AND mm.currentNodeOrBizStatus in ('endExptlist',
                     'endDissent',
                     'endSerIllegal',
                     'endRevoke',
@@ -828,7 +828,7 @@
                     '14','noRegister','cancelShow','noRegister')
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '5'.toString() ">
-                    and m.currentNodeOrBizStatus in ('overExptlist',
+                    AND mm.currentNodeOrBizStatus in ('overExptlist',
                     'overDissent',
                     'overSerIllegal',
                     'overRevoke',
@@ -839,14 +839,14 @@
                     )
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '6'.toString() ">
-                    and m.currentNodeOrBizStatus = 'clueReturn'
+                    AND mm.currentNodeOrBizStatus = 'clueReturn'
                 </if>
                 <if test="customParamMap.busStatus != null and customParamMap.busStatus == '7'.toString() ">
-                    and m.currentNodeOrBizStatus in ('overNullify','noAccept')
+                    AND mm.currentNodeOrBizStatus in ('overNullify','noAccept')
                 </if>
             </if>
         </where>
-        ORDER BY m.LAUPTIME DESC
+        ORDER BY mm.LAUPTIME DESC
     </select>
 
     <select id="searchUnionTaskList" resultMap="TaskListUnionMap">