diff --git a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
index 38f9a5a..ddad66d 100644
--- a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
+++ b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
@@ -68,6 +68,28 @@
             <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>
             <if test="condition.closeTime1 !=null">
                 and t1.close_time >= #{closeTime1}
             </if>
@@ -137,6 +159,28 @@
             <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>
             <if test="condition.closeTime1 !=null">
                 and t1.close_time >= #{closeTime1}
             </if>
diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java
index 785033b..d0b0a35 100644
--- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java
+++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java
@@ -47,6 +47,11 @@ public class FollowPoolQueryVO extends PoolQuery {
     /**
      * 区间
      */
+    private String completeTime;
+    /**
+     * 区间
+     */
+    private String defeatTime;
     private String closeTime;
     /**
      * 是否关单
@@ -101,6 +106,60 @@ public class FollowPoolQueryVO extends PoolQuery {
         return null;
     }
 
+    public Date getCompleteTime1() {
+        if (StringUtils.isBlank(completeTime)) {
+            return null;
+        }
+        String[] times = completeTime.split(",");
+        if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) {
+            LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime));
+        }
+        return null;
+    }
+
+    public Date getCompleteTime2() {
+        if (StringUtils.isBlank(completeTime)) {
+            return null;
+        }
+        String[] times = completeTime.split(",");
+        if (times.length < 2) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) {
+            LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[1])).atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime));
+        }
+        return null;
+    }
+
+    public Date getDefeatTime1() {
+        if (StringUtils.isBlank(defeatTime)) {
+            return null;
+        }
+        String[] times = defeatTime.split(",");
+        if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) {
+            LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime));
+        }
+        return null;
+    }
+
+    public Date getDefeatTime2() {
+        if (StringUtils.isBlank(defeatTime)) {
+            return null;
+        }
+        String[] times = defeatTime.split(",");
+        if (times.length < 2) {
+            return null;
+        }
+        if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) {
+            LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[1])).atZone(ZoneId.systemDefault()).toLocalDateTime();
+            return DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime));
+        }
+        return null;
+    }
+
     public Date getCloseTime1() {
         if (StringUtils.isBlank(closeTime)) {
             return null;