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

src/main/java/com/ctrip/fun/admin/controller/basic/TelTaskConttroller.java

@@ -151,6 +151,7 @@ public class TelTaskConttroller {
         BeanConverter.copyProperties(query, dto);
         query.setRegisterDateEnd(DateUtil.getEndTime4Day(query.getRegisterDateEnd()));
         query.setLastLoginDateEnd(DateUtil.getEndTime4Day(query.getLastLoginDateEnd()));
+        query.setLastFeedbackTimeEnd(DateUtil.getEndTime4Day(query.getLastFeedbackTimeEnd()));
         query.setOperateUserName(SpringSecurityUtil.getCurrentUserName());
         telTaskService.telTaskCreate(query);
         return "redirect:queryList";

src/main/java/com/ctrip/fun/admin/form/basic/TelTaskUserDto.java

@@ -56,6 +56,16 @@ public class TelTaskUserDto {
      * 最后一次登录时间结束
      */
     private Date lastLoginDateEnd;
+    
+    /**
+     * 上一次拨打时间开始
+     */
+    private Date lastFeedbackTimeStart;
+
+    /**
+     * 上一次拨打时间结束
+     */
+    private Date lastFeedbackTimeEnd;
 
     /**
      * 账户最小余额
@@ -221,5 +231,25 @@ public class TelTaskUserDto {
 		this.communeAgainTimeEnd = communeAgainTimeEnd;
 	}
 
+    @DateTimeFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "yyyy-MM-dd", 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", timezone = "GMT+8")
+	public Date getLastFeedbackTimeEnd() {
+		return lastFeedbackTimeEnd;
+	}
+
+	public void setLastFeedbackTimeEnd(Date lastFeedbackTimeEnd) {
+		this.lastFeedbackTimeEnd = lastFeedbackTimeEnd;
+	}
+
 
 }

src/main/webapp/WEB-INF/templates/basic/telTask/telTaskDetail.ftl

@@ -6,6 +6,39 @@
 {{/each}}
 </script>
 <script>
+$("#saleUserName").click(function(){
+    $('#identifier').modal('show')
+});
+
+$("#allAndNotAll").click(function() { 
+	if (this.checked){  
+		$("input[name='items']:checkbox").each(function(){ 
+		     $(this).attr("checked", true);  
+		});
+	} else {   
+		$("input[name='items']:checkbox").each(function() {   
+		     $(this).attr("checked", false);  
+		});
+	}  
+});
+
+$("#salesConfirmButton").click(function(){
+    var salesName = "";
+    $("input[name='items']:checkbox").each(function(){ 
+         if(this.checked){
+            salesName+=$(this).val();
+		    salesName+=",";
+         }
+	});
+	if(salesName.length>0){
+		$("#saleUserName").val(salesName.substring(0,salesName.length-1));
+	}else{
+		$("#saleUserName").val("");
+	}
+});
+
+
+
 $("#telTaskType").change(function(){
 	var telTaskType=$(this).val();
 	$("#telTaskId").empty();
@@ -121,7 +154,7 @@ function confirmTransfer(){
     <@com.textInputTwoDate "dto.feedbackDateStart" "dto.feedbackDateEnd" "" "最近一次拨打时间"/>
     <@com.singleSelectQuery "dto.telTaskId" telTaskList "" "任务名称"/>
     <@com.textInputTwoDate "dto.phoneAmountMin" "dto.phoneAmountMax" "" "被拨打次数" "number"/>
-    <@com.singleSelectQuery "dto.saleUserName" saleUserNameList "" "销售"/>
+    <@com.textInput "dto.saleUserName" "style=\"margin-left: 0px;\"" "销售"/>
     <@com.textInput "dto.phoneMobile" "style=\"margin-left: 0px;\"" "客户电话"/>
     <#if dto.roleTelCommune>
     <div>
@@ -136,6 +169,40 @@ function confirmTransfer(){
     <button type="button" class="btn btn-success" onclick="javascript:location.href='/telTask/queryTelTaskDetail';" style="margin-left:20px;">重置</button>
     <@com.textInput "dto.otherUserName" "style=\"display: none;\""/>
 </form>
+
+
+
+
+<div class="modal hide fade" id="identifier">
+    <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">×</button>
+        <h3>请选择销售人员</h3>
+    </div>
+    <div class="modal-body">
+      
+
+	  <#list saleUserNameList as item>
+		   <input type="checkbox" name="items"  value="${item.name!}" style="width: 18px;height: 18px;"/><span>${item.name!}</span>
+	  </#list>   
+
+      <div class="pagination pagination-mini">
+        <ul>
+        
+        </ul>
+      </div>
+        
+    </div>
+    <div class="modal-footer">
+       <span style="margin-right:430px;"> <input type="checkbox" id="allAndNotAll" value="" />全选 </span>  
+       <button class="btn" data-dismiss="modal" aria-hidden="true"  id="salesConfirmButton">确定</button>
+    </div>
+</div>
+
+
+
+
+
+
 <table class="table table-bordered table-striped widthShow">
     <thead>
     <tr>

src/main/webapp/WEB-INF/templates/basic/telTask/telTaskForm.ftl

@@ -68,6 +68,7 @@ $("#telTaskType").change(function(){
             	<@form.singleSelect path="dto.cityId" options=cityList attributes="required" label="手机归属地（市）"/>
             	<@form.textInputTwoDate path1="dto.registerDateStart" path2="dto.registerDateEnd" attributes="" label="注册时间" required = true/>
             	<@form.textInputTwoDate path1="dto.lastLoginDateStart" path2="dto.lastLoginDateEnd" attributes="" label="最后一次登录时间" required = true/>
+            	<@form.textInputTwoDate path1="dto.lastFeedbackTimeStart" path2="dto.lastFeedbackTimeEnd" attributes="" label="上一次拨打时间" required = true/>
             	<@form.textInputTwoDate path1="dto.amountMin" path2="dto.amountMax" attributes="" label="账户余额（元）" type="text" required = false/>
             	<@form.checkbox path="dto.hasOrder" attributes="" label="下过单"/>
             	<@form.checkbox path="dto.excludeCommuneAndClub" attributes="" label="排除『公社会员』"/>