Commit 7414b37fdf48446a65229ac7f4f86ecfb9f4e544
Merge remote-tracking branch 'origin/test'
Showing
2 changed files
with
11 additions
and
58 deletions
fw-valhalla-dao/src/main/resources/mapper/FollowTaskMapper.xml
@@ -68,27 +68,11 @@ | @@ -68,27 +68,11 @@ | ||
68 | <if test="condition.startTime2 !=null"> | 68 | <if test="condition.startTime2 !=null"> |
69 | and t1.create_time <= #{condition.startTime2} | 69 | and t1.create_time <= #{condition.startTime2} |
70 | </if> | 70 | </if> |
71 | - <if test="condition.completeTime1 !=null or condition.completeTime2 !=null"> | ||
72 | - and ( | ||
73 | - t1.state = 2 | ||
74 | - <if test="condition.completeTime1 !=null"> | ||
75 | - and t1.close_time >= #{condition.completeTime1} | ||
76 | - </if> | ||
77 | - <if test="condition.completeTime2 !=null"> | ||
78 | - and t1.close_time <= #{condition.completeTime2} | ||
79 | - </if> | ||
80 | - ) | 71 | + <if test="condition.closeTime1 !=null"> |
72 | + and t1.close_time >= #{closeTime1} | ||
81 | </if> | 73 | </if> |
82 | - <if test="condition.defeatTime1 !=null or condition.defeatTime2 !=null"> | ||
83 | - and ( | ||
84 | - t1.state = 3 | ||
85 | - <if test="condition.defeatTime1 !=null"> | ||
86 | - and t1.close_time >= #{condition.defeatTime1} | ||
87 | - </if> | ||
88 | - <if test="condition.defeatTime2 !=null"> | ||
89 | - and t1.close_time <= #{condition.defeatTime2} | ||
90 | - </if> | ||
91 | - ) | 74 | + <if test="condition.closeTime2 !=null"> |
75 | + and t1.close_time <= #{closeTime2} | ||
92 | </if> | 76 | </if> |
93 | <if test="condition.state !=null"> | 77 | <if test="condition.state !=null"> |
94 | and t1.state = #{condition.state} | 78 | and t1.state = #{condition.state} |
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/FollowPoolQueryVO.java
@@ -47,11 +47,7 @@ public class FollowPoolQueryVO extends PoolQuery { | @@ -47,11 +47,7 @@ public class FollowPoolQueryVO extends PoolQuery { | ||
47 | /** | 47 | /** |
48 | * 区间 | 48 | * 区间 |
49 | */ | 49 | */ |
50 | - private String completeTime; | ||
51 | - /** | ||
52 | - * 区间 | ||
53 | - */ | ||
54 | - private String defeatTime; | 50 | + private String closeTime; |
55 | /** | 51 | /** |
56 | * 是否关单 | 52 | * 是否关单 |
57 | */ | 53 | */ |
@@ -105,38 +101,11 @@ public class FollowPoolQueryVO extends PoolQuery { | @@ -105,38 +101,11 @@ public class FollowPoolQueryVO extends PoolQuery { | ||
105 | return null; | 101 | return null; |
106 | } | 102 | } |
107 | 103 | ||
108 | - public Date getCompleteTime1() { | ||
109 | - if (StringUtils.isBlank(completeTime)) { | ||
110 | - return null; | ||
111 | - } | ||
112 | - String[] times = completeTime.split(","); | ||
113 | - if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) { | ||
114 | - LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime(); | ||
115 | - return DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime)); | ||
116 | - } | ||
117 | - return null; | ||
118 | - } | ||
119 | - | ||
120 | - public Date getCompleteTime2() { | ||
121 | - if (StringUtils.isBlank(completeTime)) { | ||
122 | - return null; | ||
123 | - } | ||
124 | - String[] times = completeTime.split(","); | ||
125 | - if (times.length < 2) { | ||
126 | - return null; | ||
127 | - } | ||
128 | - if (StringUtils.isNotBlank(times[1]) && NumberUtils.isDigits(times[1])) { | ||
129 | - LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[1])).atZone(ZoneId.systemDefault()).toLocalDateTime(); | ||
130 | - return DateUtil.getEndInTime(DateUtil.localDateTime2Date(localDateTime)); | ||
131 | - } | ||
132 | - return null; | ||
133 | - } | ||
134 | - | ||
135 | - public Date getDefeatTime1() { | ||
136 | - if (StringUtils.isBlank(defeatTime)) { | 104 | + public Date getCloseTime1() { |
105 | + if (StringUtils.isBlank(closeTime)) { | ||
137 | return null; | 106 | return null; |
138 | } | 107 | } |
139 | - String[] times = defeatTime.split(","); | 108 | + String[] times = closeTime.split(","); |
140 | if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) { | 109 | if (StringUtils.isNotBlank(times[0]) && NumberUtils.isDigits(times[0])) { |
141 | LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime(); | 110 | LocalDateTime localDateTime = Instant.ofEpochMilli(NumberUtils.toLong(times[0])).atZone(ZoneId.systemDefault()).toLocalDateTime(); |
142 | return DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime)); | 111 | return DateUtil.getBeginInTime(DateUtil.localDateTime2Date(localDateTime)); |
@@ -144,11 +113,11 @@ public class FollowPoolQueryVO extends PoolQuery { | @@ -144,11 +113,11 @@ public class FollowPoolQueryVO extends PoolQuery { | ||
144 | return null; | 113 | return null; |
145 | } | 114 | } |
146 | 115 | ||
147 | - public Date getDefeatTime2() { | ||
148 | - if (StringUtils.isBlank(defeatTime)) { | 116 | + public Date getCloseTime2() { |
117 | + if (StringUtils.isBlank(closeTime)) { | ||
149 | return null; | 118 | return null; |
150 | } | 119 | } |
151 | - String[] times = defeatTime.split(","); | 120 | + String[] times = closeTime.split(","); |
152 | if (times.length < 2) { | 121 | if (times.length < 2) { |
153 | return null; | 122 | return null; |
154 | } | 123 | } |