valhalla / fw-valhalla

Commit e5261adbc27c0eb68e2ad576dc51006f78dbd12a

Authored by 张志伟
1 parent 8c1f4b9a

:alien: feature(*): 新增跟进应成交数据查询 

- 新增跟进应成交数据查询
- 屏蔽服务健康检查日志打印
Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
fw-valhalla-dao/src/main/resources/mapper/ClueTaskMapper.xml
  View file @e5261ad
... ... @@ -203,8 +203,8 @@
203 203 and t1.follow_user = #{condition.userId}
204 204 </if>
205 205 and DATE(t1.begin_time) &lt; DATE(from_unixtime(#{condition.startTime}))
206   - and (t1.close_time is null or DATE(t1.close_time) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND DATE(from_unixtime(#{condition.startTime})))
207   - and DATE(t1.deadline) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND DATE(from_unixtime(#{condition.startTime}))
  206 + and (t1.close_time is null or DATE(t1.close_time) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND DATE(from_unixtime(#{condition.endTime})))
  207 + and DATE(t1.deadline) BETWEEN DATE(from_unixtime(#{condition.startTime})) AND DATE(from_unixtime(#{condition.endTime}))
208 208 </where>
209 209 </select>
210 210 </mapper>
... ...
fw-valhalla-sdk/src/main/java/cn/fw/valhalla/sdk/param/ShouldBeCompletedQuery.java
  View file @e5261ad
... ... @@ -38,7 +38,7 @@ public class ShouldBeCompletedQuery {
38 38  
39 39 public String getStartTime() {
40 40 if (Objects.isNull(startTime)) {
41   - long second = YearMonth.now().atEndOfMonth().atStartOfDay(ZoneId.systemDefault()).toEpochSecond();
  41 + long second = YearMonth.now().atDay(1).atStartOfDay(ZoneId.systemDefault()).toEpochSecond();
42 42 return String.valueOf(second);
43 43 }
44 44 String timeStr = String.valueOf(startTime);
... ... @@ -47,7 +47,7 @@ public class ShouldBeCompletedQuery {
47 47  
48 48 public String getEndTime() {
49 49 if (Objects.isNull(endTime)) {
50   - long second = YearMonth.now().atDay(1).atStartOfDay(ZoneId.systemDefault()).toEpochSecond();
  50 + long second = YearMonth.now().atEndOfMonth().atStartOfDay(ZoneId.systemDefault()).toEpochSecond();
51 51 return String.valueOf(second);
52 52 }
53 53 String timeStr = String.valueOf(endTime);
... ...