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

src/main/java/com/ctrip/fun/golf/dao/basic/TelTaskDao.java

@@ -62,7 +62,7 @@ public class TelTaskDao extends GenericHibernateDao<TelTask, Integer> {
         if (queryBean.getLastLoginDateEnd() != null) {
             sb.append("AND u.LastLoginTime<='")
                     .append(DateUtil.getDateTimeStr(queryBean.getLastLoginDateEnd())).append("' ");
-        }
+        }     
         if (queryBean.getAmountMin() != null) {
             sb.append("AND u.PrePayCardAmount>=").append(queryBean.getAmountMin()).append(" ");
         }
@@ -86,8 +86,10 @@ public class TelTaskDao extends GenericHibernateDao<TelTask, Integer> {
             sb.append("AND u.vipGrade & ").append(VipGradeEnum.VIP2.getKey()).append("<>")
                     .append(VipGradeEnum.VIP2.getKey()).append(" ");
         }
-        sb.append("AND NOT EXISTS (SELECT * FROM tel_task_detail ttd WHERE ttd.TaskType=")
-                .append(telTask.getType()).append(" AND ttd.Phone=u.BindedMobilePhone) ");
+        //上次拨打电话时间
+        if (queryBean.getLastFeedbackTimeStart() != null&&queryBean.getLastFeedbackTimeEnd() != null) {
+            sb.append("AND u.bindedMobilePhone in(SELECT phone from (SELECT Phone,max(FeedbackTime) maxfeedbackTime FROM tel_task_detail GROUP BY Phone HAVING maxfeedbackTime>'"+DateUtil.getDateTimeStr(queryBean.getLastFeedbackTimeStart())+"' and maxfeedbackTime<'"+DateUtil.getDateTimeStr(queryBean.getLastFeedbackTimeEnd())+"') temp) ");   		
+        }
         sb.append("GROUP BY u.BindedMobilePhone ");
         Query query = session.createSQLQuery(sb.toString());
         query.executeUpdate();

src/main/java/com/ctrip/fun/golf/dao/basic/TelTaskDetailDao.java

@@ -379,7 +379,14 @@ public class TelTaskDetailDao extends GenericHibernateDao<TelTaskDetail, Integer
                     .append(DateUtil.getDateTimeStr(queryBean.getFeedbackDateEnd())).append("' ");
         }
         if (StringUtils.hasText(queryBean.getSaleUserName())) {
-            sql.append(" and t.bindUserName='").append(queryBean.getSaleUserName()).append("'");
+            sql.append(" and t.bindUserName in(");
+            String[] saleUserName = queryBean.getSaleUserName().split(",");
+            String nameSql = "";
+            for(String name:saleUserName){
+            	nameSql+="'"+name+"',";
+            }
+            nameSql=nameSql.substring(0, nameSql.length()-1);
+            sql.append(nameSql).append(") ");  
         }
         if (queryBean.getPhoneAmountMin() != null) {
             sql.append(" and t.phoneAmount>=").append(queryBean.getPhoneAmountMin());

src/main/java/com/ctrip/fun/golf/service/basic/TelTaskDetailService.java

@@ -155,6 +155,7 @@ public class TelTaskDetailService extends GenericService<TelTaskDetailDao, TelTa
         telTaskDetailDao.update(telTaskDetail);
         // 记录日志
         telTaskDetailFeedBackDao.save(telTaskDetail, TelTaskDetailFeedBackOperateStatusEnum.BOUND, operateUserName, null, false);
+        System.out.println("aaaaaaaaa");
     }
 
     private void populateInfo(TelTaskDetailCallBean result, TelTaskDetail telTaskDetail) {

src/main/java/com/ctrip/fun/golf/service/basic/TelTaskService.java

@@ -119,6 +119,12 @@ public class TelTaskService extends GenericService<TelTaskDao, TelTask, Integer,
                             + DateUtil.getDateStr(telTaskUserQuery.getLastLoginDateStart()) + "~"
                             + DateUtil.getDateStr(telTaskUserQuery.getLastLoginDateEnd()));
                 }
+                if (telTaskUserQuery.getLastFeedbackTimeStart() != null
+                        || telTaskUserQuery.getLastFeedbackTimeEnd() != null) {
+                    remarkList.add("上一次拨打时间："
+                            + DateUtil.getDateStr(telTaskUserQuery.getLastFeedbackTimeStart()) + "~"
+                            + DateUtil.getDateStr(telTaskUserQuery.getLastFeedbackTimeEnd()));
+                }
                 if (telTaskUserQuery.getAmountMin() != null
                         || telTaskUserQuery.getAmountMax() != null) {
                     remarkList.add("账户余额："