diff --git a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
index dd0330a..cf34587 100644
--- a/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
+++ b/fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
@@ -68,27 +68,11 @@
and t1.create_time <= #{condition.startTime2}
-
- and (
- t1.state = 2
-
- and t1.close_time >= #{condition.completeTime1}
-
-
- and t1.close_time <= #{condition.completeTime2}
-
- )
+
+ and t1.close_time >= #{closeTime1}
-
- and (
- t1.state = 3
-
- and t1.close_time >= #{condition.defeatTime1}
-
-
- and t1.close_time <= #{condition.defeatTime2}
-
- )
+
+ and t1.close_time <= #{closeTime2}
and t1.state = #{condition.state}
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 2e8f45f..785033b 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,11 +47,7 @@ public class FollowPoolQueryVO extends PoolQuery {
/**
* 区间
*/
- private String completeTime;
- /**
- * 区间
- */
- private String defeatTime;
+ private String closeTime;
/**
* 是否关单
*/
@@ -105,38 +101,11 @@ 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)) {
+ public Date getCloseTime1() {
+ if (StringUtils.isBlank(closeTime)) {
return null;
}
- String[] times = defeatTime.split(",");
+ String[] times = closeTime.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));
@@ -144,11 +113,11 @@ public class FollowPoolQueryVO extends PoolQuery {
return null;
}
- public Date getDefeatTime2() {
- if (StringUtils.isBlank(defeatTime)) {
+ public Date getCloseTime2() {
+ if (StringUtils.isBlank(closeTime)) {
return null;
}
- String[] times = defeatTime.split(",");
+ String[] times = closeTime.split(",");
if (times.length < 2) {
return null;
}