外呼管理排序，我的任务中可二次回访的有“未回访”，“关机”，“无人接听”，“拒接”

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallOutPlanController.cs

@@ -760,11 +760,12 @@ namespace CallCenterApi.Interface.Controllers.callout
         {
             StringBuilder sb = new StringBuilder();
             int userid = CurrentUser.UserData.F_UserId;
+            #region 查询条件
             sb.Append(" and F_UserId=" + userid);
             sb.Append(" and F_DeleteFlag=0 ");
             //sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_YHFKName,'')!='已同意'");
             //sb.Append(" and isnull(F_HJJGName,'')=''");
-            sb.Append(" and isnull(F_HJJGName,'')!='正常接通' and isnull(F_HJJGName,'')!='免回访'");
+            sb.Append(" and (isnull(F_HJJGName,'')='' or isnull(F_HJJGName,'')='关机' or isnull(F_HJJGName,'')='无人接听' or isnull(F_HJJGName,'')='拒接')");
             sb.Append(" and F_Taskid in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0)");
             if (!string.IsNullOrWhiteSpace(key))
             {
@@ -776,13 +777,14 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
             //}
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
+            #endregion
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                     "T_Call_OutTaskTelNum",
                     "F_Id",
                     "*",
                     sb.ToString(),
-                    "ORDER BY F_Id desc",
+                    "ORDER BY ExpandDatField1 asc, F_Id desc",
                     pagesize,
                     pageindex,
                     true,
@@ -800,6 +802,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         {
             StringBuilder sb = new StringBuilder();
             int userid = CurrentUser.UserData.F_UserId;
+            #region 查询条件
             sb.Append(" and F_UserId=" + userid);
             sb.Append(" and F_DeleteFlag=0 ");
             if (hjjgid != 0)
@@ -824,13 +827,14 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
             //}
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
+            #endregion
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                     "T_Call_OutTaskTelNum",
                     "F_Id",
                     "*",
                     sb.ToString(),
-                    "ORDER BY F_Id desc",
+                    "ORDER BY ExpandDatField1 desc,F_Id desc",
                     pagesize,
                     pageindex,
                     true,
@@ -859,6 +863,7 @@ namespace CallCenterApi.Interface.Controllers.callout
         public ActionResult GetResultList(string key, int userid = 0, int hjjgid = 0, int yhfkid = 0, int pagesize = 10, int pageindex = 1)
         {
             StringBuilder sb = new StringBuilder();
+            #region 查询条件
             sb.Append(" and F_DeleteFlag=0 ");
             if (userid != 0)
             {
@@ -886,13 +891,14 @@ namespace CallCenterApi.Interface.Controllers.callout
             //    sqlwhere = " and F_TaskName like '%" + key + "%' or F_TaskRemark like '%" + key + "%' ";
             //}
             //sb.Append(" and F_TaskID in (select F_TaskID from T_Call_OutTask where F_IsStart=1 and F_DeleteFlag=0 " + sqlwhere + ") ");
+            #endregion
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
                     "T_Call_OutTaskTelNum",
                     "F_Id",
                     "*",
                     sb.ToString(),
-                    "ORDER BY F_Id desc",
+                    "ORDER BY ExpandDatField1 desc,F_Id desc",
                     pagesize,
                     pageindex,
                     true,