diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/CallTypeEnum.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/CallTypeEnum.java index 4c2b077..28a0a04 100644 --- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/CallTypeEnum.java +++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/CallTypeEnum.java @@ -15,11 +15,11 @@ public enum CallTypeEnum implements IEnum { /** * 主叫 */ - CALL(1, "主叫"), + CALL(0, "主叫"), /** * 被叫 */ - P_CALL(2, "被叫"), + P_CALL(1, "被叫"), ; /** diff --git a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/SecretReportHistoryQuery.java b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/SecretReportHistoryQuery.java index 6f95191..b4ed1f0 100644 --- a/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/SecretReportHistoryQuery.java +++ b/fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/SecretReportHistoryQuery.java @@ -1,13 +1,14 @@ package cn.fw.valhalla.domain.query; +import cn.fw.common.validator.EnumValue; import cn.fw.valhalla.common.utils.DateUtil; +import cn.fw.valhalla.domain.enums.CallTypeEnum; import lombok.Data; import lombok.EqualsAndHashCode; import lombok.ToString; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.math.NumberUtils; -import javax.validation.constraints.NotNull; import java.time.Instant; import java.time.LocalDateTime; import java.time.ZoneId; @@ -23,10 +24,15 @@ import java.util.Date; @Data @ToString(callSuper = true) public class SecretReportHistoryQuery extends PoolQuery { - @NotNull(message = "跟进类型不能为空") private Integer taskType; /** + * 主叫/被叫 + */ + @EnumValue(enumClass = CallTypeEnum.class, message = "主被叫类型不正确") + private Integer callType; + + /** * 通话时间段(区间) */ private String callTime; diff --git a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java index f150b0d..aa34e76 100644 --- a/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java +++ b/fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java @@ -199,6 +199,9 @@ public class PoolBizService { */ public AppPage secretReportList(SecretReportHistoryQuery query) { BV.isNotEmpty(query.getShopIds(), () -> "人员权限范围不正确,请确认是否有管理权限"); + if (Objects.isNull(query.getOrder())) { + query.setOrderString(" order by call_time asc "); + } AppPageVO page = AppPageVO.init(query); long total = secretReportHistoryService.secretReportCount(query); if (total <= 0) {