From f943af3f70618509d9585c555678147dd80ec296 Mon Sep 17 00:00:00 2001
From: Kurisu <makise_kurisuu@outlook.jp>
Date: Sat, 26 Dec 2020 15:42:57 +0800
Subject: [PATCH] :construction: 跟进池查询参数修改

---
 fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
index cf34587..38f9a5a 100644
--- a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
+++ b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
@@ -137,27 +137,11 @@
             <if test="condition.startTime2 !=null">
                 and t1.create_time &lt;=  #{condition.startTime2}
             </if>
-            <if test="condition.completeTime1 !=null or condition.completeTime2 !=null">
-                and (
-                t1.state = 2
-                <if test="condition.completeTime1 !=null">
-                    and t1.close_time >= #{condition.completeTime1}
-                </if>
-                <if test="condition.completeTime2 !=null">
-                    and t1.close_time &lt;= #{condition.completeTime2}
-                </if>
-                )
-            </if>
-            <if test="condition.defeatTime1 !=null or condition.defeatTime2 !=null">
-                and (
-                t1.state = 3
-                <if test="condition.defeatTime1 !=null">
-                    and t1.close_time >= #{condition.defeatTime1}
-                </if>
-                <if test="condition.defeatTime2 !=null">
-                    and t1.close_time &lt;= #{condition.defeatTime2}
-                </if>
-                )
+            <if test="condition.closeTime1 !=null">
+                and t1.close_time >= #{closeTime1}
+            </if>
+            <if test="condition.closeTime2 !=null">
+                and t1.close_time &lt;= #{closeTime2}
             </if>
             <if test="condition.state !=null">
                 and t1.state = #{condition.state}
--
libgit2 0.22.2