调整问卷

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Question/QuestionnaireController.cs

@@ -967,7 +967,7 @@ namespace CallCenterApi.Interface.Controllers.Question
             if (Request.IsAuthenticated)
             {
                 DataTable dt = new DataTable();
-                dt = new BLL.T_Call_OutTask().GetList("").Tables[0];
+                dt = new BLL.T_Call_OutTask().GetList("  F_DeleteFlag=0 ").Tables[0];
                 return Success("加载成功", dt);
             }
             return NoToken("未知错误，请重新登录");

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

@@ -102,15 +102,37 @@ namespace CallCenterApi.Interface.Controllers.callout
                 return Success("修改成功" + ",操作人：" + CurrentUser.UserData.F_UserCode);
             return Error("修改失败" + ",操作人：" + CurrentUser.UserData.F_UserCode);
         }
+        //删除任务
         public ActionResult DeleteTask(int id = 0)
         {
-            if (otBLL.Delete(id))
+            if (id > 0)
             {
-                return Success("删除成功" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+                var tellist = otnBLL.GetRecordCount(" F_TaskId=" + id);
+                if (tellist > 0)
+                {
+                    return Error("请先清理任务下的号码，再做删除！");
+                }
+                if (otBLL.Delete(id))
+                {
+                    return Success("删除成功" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+                }
+                else
+                {
+                    return Error("删除失败!" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+                }
+            }
+            return Error("参数传入失败");
+        }
+        //清理号码
+        public ActionResult DeletesTaskTel(int id = 0)
+        {
+            if (otnBLL.DeleteByTask(id))
+            {
+                return Success("清理任务下号码成功" + ",操作人：" + CurrentUser.UserData.F_UserCode);
             }
             else
             {
-                return Error("删除失败!" + ",操作人：" + CurrentUser.UserData.F_UserCode);
+                return Error("清理任务下号码失败!" + ",操作人：" + CurrentUser.UserData.F_UserCode);
             }
         }
 
@@ -544,6 +566,8 @@ namespace CallCenterApi.Interface.Controllers.callout
         #region 分配
         public ActionResult fpdata(string fpvalue, string[] arruser, string key)
         {
+            if (arruser.Length <= 0)
+                return Error("请选择分配坐席");
             string fptype = "0";
             StringBuilder sb = new StringBuilder();