优化通话池的查询

张志伟
1 parent 2f6cb7a3
Showing 3 changed files with 13 additions and 4 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/enums/CallTypeEnum.java
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/query/SecretReportHistoryQuery.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/PoolBizService.java
@@ -15,11 +15,11 @@ public enum CallTypeEnum implements IEnum&lt;Integer&gt; {
     /**
      * 主叫
      */
-    CALL(1, "主叫"),
+    CALL(0, "主叫"),
     /**
      * 被叫
      */
-    P_CALL(2, "被叫"),
+    P_CALL(1, "被叫"),
     ;
  
     /**
 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;
@@ -199,6 +199,9 @@ public class PoolBizService {
      */
     public AppPage<SecretReportHistoryVO> secretReportList(SecretReportHistoryQuery query) {
         BV.isNotEmpty(query.getShopIds(), () -> "人员权限范围不正确，请确认是否有管理权限");
+        if (Objects.isNull(query.getOrder())) {
+            query.setOrderString(" order by call_time asc ");
+        }
         AppPageVO<SecretReportHistoryVO> page = AppPageVO.init(query);
         long total = secretReportHistoryService.secretReportCount(query);
         if (total <= 0) {