donghuang/yoqw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cdr insert date bug fixes

Browse Source
This commit is contained in:
Donghuang 2021-09-26 17:23:18 +08:00
parent 99762e6475
commit 5cbc91fe60
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/model/src/main/java/com/pudonghot/yo/model/domain/CallDetailRecordBase.java
View File

@ -3,6 +3,7 @@ package com.pudonghot.yo.model.domain;
import lombok.Getter; import lombok.Getter;
import lombok.Setter; import lombok.Setter;
import java.util.Date; import java.util.Date;
import lombok.ToString;
import com.wacai.tigon.model.M0; import com.wacai.tigon.model.M0;
import lombok.RequiredArgsConstructor; import lombok.RequiredArgsConstructor;
import me.chyxion.tigon.mybatis.NotUpdate; import me.chyxion.tigon.mybatis.NotUpdate;
@ -14,6 +15,7 @@ import lombok.experimental.FieldNameConstants;
*/ */
@Getter @Getter
@Setter @Setter
@ToString
@FieldNameConstants(prefix = "") @FieldNameConstants(prefix = "")
public class CallDetailRecordBase extends M0<Integer> { public class CallDetailRecordBase extends M0<Integer> {
@NotUpdate @NotUpdate

4
server/src/main/java/com/pudonghot/yo/fsagent/service/impl/CallDetailRecordServiceImpl.java
View File

@ -5,8 +5,8 @@ import java.util.Date;
import java.util.Calendar; import java.util.Calendar;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import me.chyxion.tigon.mybatis.Search; import me.chyxion.tigon.mybatis.Search;
import org.apache.commons.lang3.time.DateUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.apache.commons.lang3.time.DateUtils;
import com.pudonghot.yo.mapper.CallDetailRecordMapper; import com.pudonghot.yo.mapper.CallDetailRecordMapper;
import com.pudonghot.yo.model.domain.CallDetailRecord; import com.pudonghot.yo.model.domain.CallDetailRecord;
import com.pudonghot.yo.model.domain.CallDetailRecordAll; import com.pudonghot.yo.model.domain.CallDetailRecordAll;
@ -39,7 +39,7 @@ public class CallDetailRecordServiceImpl
if (req.getDialType() == CallDetailRecordBase.DialType.CAMPAIGN) { if (req.getDialType() == CallDetailRecordBase.DialType.CAMPAIGN) {
val calledNumber = req.getCalledNumber(); 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) val search = new Search(CallDetailRecord.CALLED_NUMBER, calledNumber)
.between(CallDetailRecord.START_STAMP, .between(CallDetailRecord.START_STAMP,
DateUtils.addDays(today, -2), DateUtils.addDays(today, -2),

4
server/src/test/java/com/pudonghot/yo/state/TestDriver.java
View File

@ -27,8 +27,8 @@ public class TestDriver {
public void testDate() { public void testDate() {
log.info("Before Yesterday [{}].", DateUtils.addDays( 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( log.info("Yesterday [{}].", DateUtils.addDays(
DateUtils.truncate(new Date(), Calendar.HOUR), -1)); DateUtils.truncate(new Date(), Calendar.DATE), -1));
} }
} }