电销系统：新建任务允许重复筛选用户；增加按照上次拨打时间筛选用户功能；增加一些回访状态

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskDetailFeedBackOperateStatusEnum.java

@@ -21,6 +21,28 @@ public enum TelTaskDetailFeedBackOperateStatusEnum {
     BLACK(TelTaskDetailFeedBackStatusEnum.BLACK, null, null),
 
     PRE_INTENTION(TelTaskDetailFeedBackStatusEnum.PRE_INTENTION, null, null),
+
+    NONE_NEED(TelTaskDetailFeedBackStatusEnum.NONE_NEED, null, null),
+    
+    NOT_PLAY(TelTaskDetailFeedBackStatusEnum.NOT_PLAY, null, null),
+    
+    NONLOCAL(TelTaskDetailFeedBackStatusEnum.NONLOCAL, null, null),
+    
+    OTHERCHANNEL(TelTaskDetailFeedBackStatusEnum.OTHERCHANNEL, null, null),
+    
+    MALAISE(TelTaskDetailFeedBackStatusEnum.MALAISE, null, null),
+    
+    NONSPEAK(TelTaskDetailFeedBackStatusEnum.NONSPEAK, null, null),
+    
+    BUSY(TelTaskDetailFeedBackStatusEnum.BUSY, null, null),
+    
+    SAMEINDUSTRY(TelTaskDetailFeedBackStatusEnum.SAMEINDUSTRY, null, null),
+    
+    FOREIGNER(TelTaskDetailFeedBackStatusEnum.FOREIGNER, null, null),
+    
+    NONCOMMUNE(TelTaskDetailFeedBackStatusEnum.NONCOMMUNE, null, null),
+    
+    NONLIKE(TelTaskDetailFeedBackStatusEnum.NONLIKE, null, null),
     
     // value大于10的是自定义类型
     BOUND(null, 11, "绑定"),

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskDetailFeedBackStatusEnum.java

@@ -5,7 +5,9 @@ import java.util.Map;
 
 public enum TelTaskDetailFeedBackStatusEnum {
 
-    NONE(0, "未拨打"), DEAL(1, "成交"), INTERESTED(2, "感兴趣"), NORESPONSE(3, "无应答"), EMPTY(4, "空号"), REJECTED(5, "被拒绝"), BLACK(6, "黑名单"), PRE_INTENTION(7, "初步意向");
+    NONE(0, "未拨打"), DEAL(1, "成交"), INTERESTED(2, "感兴趣"), NORESPONSE(3, "无应答"), EMPTY(4, "空号"), REJECTED(5, "被拒绝"), BLACK(6, "挂断,拒接,黑名单"), PRE_INTENTION(7, "初步意向"),
+    NONE_NEED(8, "不需要"), NOT_PLAY(9, "不打球"), NONLOCAL(10, "在外地"), OTHERCHANNEL(11, "其它渠道(球队，俱乐部等)"), MALAISE(12, "身体不适"), NONSPEAK(13, "接通后没音"), BUSY(14, "没空"), 
+    SAMEINDUSTRY(15, "同行,教练"),FOREIGNER(16, "外国人"), NONCOMMUNE(17, "非社员"), NONLIKE(18, "爱玩不好不续费");
 
     private int value;
     private String msg;

fun-common-vo/src/main/java/com/ctrip/fun/common/vo/basic/tel/TelTaskUserQuery.java

@@ -53,8 +53,18 @@ public class TelTaskUserQuery implements java.io.Serializable {
      * 最后一次登录时间结束
      */
     private Date lastLoginDateEnd;
+    
+    /**
+     * 上一次拨打时间开始
+     */
+    private Date lastFeedbackTimeStart;
 
     /**
+     * 上一次拨打时间结束
+     */
+    private Date lastFeedbackTimeEnd;
+    
+    /**
      * 账户最小余额
      */
     private BigDecimal amountMin;
@@ -162,6 +172,26 @@ public class TelTaskUserQuery implements java.io.Serializable {
     public void setLastLoginDateEnd(Date lastLoginDateEnd) {
         this.lastLoginDateEnd = lastLoginDateEnd;
     }
+    
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getLastFeedbackTimeStart() {
+		return lastFeedbackTimeStart;
+	}
+
+	public void setLastFeedbackTimeStart(Date lastFeedbackTimeStart) {
+		this.lastFeedbackTimeStart = lastFeedbackTimeStart;
+	}
+
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+	public Date getLastFeedbackTimeEnd() {
+		return lastFeedbackTimeEnd;
+	}
+
+	public void setLastFeedbackTimeEnd(Date lastFeedbackTimeEnd) {
+		this.lastFeedbackTimeEnd = lastFeedbackTimeEnd;
+	}
 
     public BigDecimal getAmountMin() {
         return amountMin;
@@ -247,5 +277,5 @@ public class TelTaskUserQuery implements java.io.Serializable {
 	public void setCommuneAgainTimeEnd(Date communeAgainTimeEnd) {
 		this.communeAgainTimeEnd = communeAgainTimeEnd;
 	}
-
+	
 }