更新bug

codegit/CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -995,7 +995,7 @@ namespace CallCenterApi.DAL
             strSql.Append(" select callnumber,");
             strSql.Append(" case calltype when 1 then '呼出' else '呼入' end calltypes, ");
             strSql.Append(" case callstate when 1 then '已接通' else '未接通' end callstates, ");
-            strSql.Append(" case isdeal when 0 then '未处理' when 1 then '已处理' else '注销' end isdeals, ");
+            //strSql.Append(" case isdeal when 0 then '未处理' when 1 then '已处理' else '注销' end isdeals, ");
             strSql.Append(" usercode, (select F_UserName from T_Sys_UserAccount where F_UserCode= c.UserCode) username, ");
             strSql.Append(" begintime, talkstarttime, talkendtime, endtime, talklongtime");
             strSql.Append(" FROM T_Call_CallRecords c");

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

@@ -701,7 +701,8 @@ namespace CallCenterApi.Interface.Controllers.callout
             int userid = CurrentUser.UserData.F_UserId;
             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,'')!='正常接通' and isnull(F_YHFKName,'')!='已同意'");
+            sb.Append(" and 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))
             {
@@ -909,13 +910,13 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// <returns></returns>
         public ActionResult Answers(int taskid,int custelid,string[] ans,int hjjgid,int yhfkid, int cusid = 0)
         {
-            if (ans != null)
-            {
+            
                 int cc = 0;
                 var ansModel = new Model.T_Call_OutAnswers();
                 string askqids = "";
                 string ansids = "";
-
+            if (ans != null)
+            {
                 //先删除 后添加
                 ansBLL.DeleteByTelid(custelid, taskid);
 
@@ -957,26 +958,29 @@ namespace CallCenterApi.Interface.Controllers.callout
                     }
                 }
 
-                if (custelid > 0)
+                
+            }
+            if (custelid > 0)
+            {
+                var otnModel = otnBLL.GetModel(custelid);
+                if (otnModel != null)
                 {
-                    var otnModel = otnBLL.GetModel(custelid);
-                    if (otnModel != null)
-                    {
-                        otnModel.F_HJJGId = hjjgid;
-                        var hjconfig = new BLL.T_Sys_DictionaryValue().GetModel(hjjgid);
-                        if (hjconfig != null)
-                            otnModel.F_HJJGName = hjconfig.F_Name;
-                        otnModel.F_YHFKId = yhfkid;
-                        var fkconfig = new BLL.T_Sys_DictionaryValue().GetModel(yhfkid);
-                        if (fkconfig != null)
-                            otnModel.F_YHFKName = fkconfig.F_Name;
-                        otnModel.F_AskRes = askqids;
-                        otnModel.F_AskInfo = ansids;
-                        otnBLL.Update(otnModel);
-                        planrecord(otnModel);
-                    }
+                    otnModel.F_HJJGId = hjjgid;
+                    var hjconfig = new BLL.T_Sys_DictionaryValue().GetModel(hjjgid);
+                    if (hjconfig != null)
+                        otnModel.F_HJJGName = hjconfig.F_Name;
+                    otnModel.F_YHFKId = yhfkid;
+                    var fkconfig = new BLL.T_Sys_DictionaryValue().GetModel(yhfkid);
+                    if (fkconfig != null)
+                        otnModel.F_YHFKName = fkconfig.F_Name;
+                    otnModel.F_AskRes = askqids;
+                    otnModel.F_AskInfo = ansids;
+                    otnBLL.Update(otnModel);
+                    planrecord(otnModel);
                 }
-
+            }
+            if (ans != null)
+            {
                 if (cc == ans.Length)
                 {
                     return Success("问卷答案提交成功！taskid=" + taskid + ",custelid=" + custelid + ",操作人：" + CurrentUser.UserData.F_UserCode);
@@ -987,7 +991,10 @@ namespace CallCenterApi.Interface.Controllers.callout
                     return Error("问卷答案提交失败！taskid=" + taskid + ",custelid=" + custelid + ",操作人：" + CurrentUser.UserData.F_UserCode);
                 }
             }
-            return Error("没有问卷答案提交");
+            else
+            {
+                return Error("没有问卷答案提交");
+            }
         }
         #endregion
 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallrecordsController.cs

@@ -260,9 +260,13 @@ namespace CallCenterApi.Interface.Controllers.tel
         private string[] col()
         {
             string[] ccc = {
-                   "电话号码","呼叫方向","呼叫状态","是否处理","坐席工号","坐席姓名",
+                   "电话号码","呼叫方向","呼叫状态","坐席工号","坐席姓名",
                   "开始时间","通话开始时间","通话结束时间","结束时间","通话时长"
             };
+            //string[] ccc = {
+            //       "电话号码","呼叫方向","呼叫状态","是否处理","坐席工号","坐席姓名",
+            //      "开始时间","通话开始时间","通话结束时间","结束时间","通话时长"
+            //};
             return ccc;
         }