From 5cbc91fe603f386d6a1ad98c4992844db51b1fb8 Mon Sep 17 00:00:00 2001 From: Donghuang Date: Sun, 26 Sep 2021 17:23:18 +0800 Subject: [PATCH] cdr insert date bug fixes --- .../com/pudonghot/yo/model/domain/CallDetailRecordBase.java | 2 ++ .../yo/fsagent/service/impl/CallDetailRecordServiceImpl.java | 4 ++-- server/src/test/java/com/pudonghot/yo/state/TestDriver.java | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecordBase.java b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecordBase.java index ab3e1983..6032abf7 100644 --- a/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecordBase.java +++ b/lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecordBase.java @@ -3,6 +3,7 @@ package com.pudonghot.yo.model.domain; import lombok.Getter; import lombok.Setter; import java.util.Date; +import lombok.ToString; import com.wacai.tigon.model.M0; import lombok.RequiredArgsConstructor; import me.chyxion.tigon.mybatis.NotUpdate; @@ -14,6 +15,7 @@ import lombok.experimental.FieldNameConstants; */ @Getter @Setter +@ToString @FieldNameConstants(prefix = "") public class CallDetailRecordBase extends M0 { @NotUpdate diff --git a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallDetailRecordServiceImpl.java b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallDetailRecordServiceImpl.java index 9c93b12c..c7b02efd 100644 --- a/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallDetailRecordServiceImpl.java +++ b/server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallDetailRecordServiceImpl.java @@ -5,8 +5,8 @@ import java.util.Date; import java.util.Calendar; import lombok.extern.slf4j.Slf4j; import me.chyxion.tigon.mybatis.Search; -import org.apache.commons.lang3.time.DateUtils; import org.springframework.stereotype.Service; +import org.apache.commons.lang3.time.DateUtils; import com.pudonghot.yo.mapper.CallDetailRecordMapper; import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.model.domain.CallDetailRecordAll; @@ -39,7 +39,7 @@ public class CallDetailRecordServiceImpl if (req.getDialType() == CallDetailRecordBase.DialType.CAMPAIGN) { val calledNumber = req.getCalledNumber(); - val today = DateUtils.truncate(new Date(), Calendar.HOUR); + val today = DateUtils.truncate(new Date(), Calendar.DATE); val search = new Search(CallDetailRecord.CALLED_NUMBER, calledNumber) .between(CallDetailRecord.START_STAMP, DateUtils.addDays(today, -2), diff --git a/server/src/test/java/com/pudonghot/yo/state/TestDriver.java b/server/src/test/java/com/pudonghot/yo/state/TestDriver.java index e5e18a4a..f0fd1a96 100644 --- a/server/src/test/java/com/pudonghot/yo/state/TestDriver.java +++ b/server/src/test/java/com/pudonghot/yo/state/TestDriver.java @@ -27,8 +27,8 @@ public class TestDriver { public void testDate() { log.info("Before Yesterday [{}].", DateUtils.addDays( - DateUtils.truncate(new Date(), Calendar.HOUR), -2)); + DateUtils.truncate(new Date(), Calendar.DATE), -2)); log.info("Yesterday [{}].", DateUtils.addDays( - DateUtils.truncate(new Date(), Calendar.HOUR), -1)); + DateUtils.truncate(new Date(), Calendar.DATE), -1)); } }