权限bug 字典参数bug

CallCenterApi/CallCenterApi.BLL/T_Call_Answers.cs

@@ -108,6 +108,28 @@ namespace CallCenterApi.BLL
         /// <summary>
         /// 获得数据列表
         /// </summary>
+        public List<CallCenterApi.Model.T_Call_Answers> DataTableToListDTO(DataTable dt)
+        {
+            List<CallCenterApi.Model.T_Call_Answers> modelList = new List<CallCenterApi.Model.T_Call_Answers>();
+            int rowsCount = dt.Rows.Count;
+            if (rowsCount > 0)
+            {
+                CallCenterApi.Model.T_Call_Answers model;
+                for (int n = 0; n < rowsCount; n++)
+                {
+                    model = dal.DataRowToModelDTO(dt.Rows[n]);
+                    if (model != null)
+                    {
+                        modelList.Add(model);
+                    }
+                }
+            }
+            return modelList;
+        }
+
+        /// <summary>
+        /// 获得数据列表
+        /// </summary>
         public DataSet GetAllList()
         {
             return GetList("");

CallCenterApi/CallCenterApi.BLL/T_Call_BanCallOut.cs

@@ -26,7 +26,8 @@ namespace CallCenterApi.BLL
                     model = new CallCenterApi.Model.T_Call_BanCallOut();
                     model.Id = Convert.ToInt32(dt.Rows[n]["F_Id"]);
                     model.F_Phone = dt.Rows[n]["F_Phone"] == null ? "" : dt.Rows[n]["F_Phone"].ToString();
-                    model.F_SetTime = dt.Rows[n]["F_SetTime"] == null ? null : (DateTime?)Convert.ToDateTime(dt.Rows[n]["F_Phone"].ToString());
+                    model.F_SetTime = dt.Rows[n]["F_SetTime"] == null ? null : (DateTime?)Convert.ToDateTime(dt.Rows[n]["F_SetTime"].ToString());
+                    model.F_Remark = dt.Rows[n]["F_Remark"] == DBNull.Value ? "" : dt.Rows[n]["F_Remark"].ToString();
                     modelList.Add(model);
                 }
             }

CallCenterApi/CallCenterApi.DAL/T_Call_Answers.cs

@@ -148,7 +148,7 @@ namespace CallCenterApi.DAL
                 return false;
             }
         }
-        public bool DeleteByTelid(int F_CusTelID,int F_TaskID)
+        public bool DeleteByTelid(int F_CusTelID, int F_TaskID)
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("delete from T_Call_Answers ");
@@ -283,6 +283,32 @@ namespace CallCenterApi.DAL
         }
 
         /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public CallCenterApi.Model.T_Call_Answers DataRowToModelDTO(DataRow row)
+        {
+            CallCenterApi.Model.T_Call_Answers model = new CallCenterApi.Model.T_Call_Answers();
+            if (row != null)
+            {
+
+                if (row["F_Answer"] != null)
+                {
+                    model.F_Answer = row["F_Answer"].ToString();
+                }
+                if (row["F_CusTelID"] != null && row["F_CusTelID"].ToString() != "")
+                {
+                    model.F_CusTelID = int.Parse(row["F_CusTelID"].ToString());
+                }
+                if (row["F_QID"] != null && row["F_QID"].ToString() != "")
+                {
+                    model.F_QID = int.Parse(row["F_QID"].ToString());
+                }
+                
+            }
+            return model;
+        }
+
+        /// <summary>
         /// 获得数据列表
         /// </summary>
         public DataSet GetList(string strWhere)

CallCenterApi/CallCenterApi.DAL/T_Call_BanCallOut.cs

@@ -13,26 +13,30 @@ namespace CallCenterApi.DAL
     {
         public int Add(Model.T_Call_BanCallOut model)
         {
-            var sql = "insert into T_Call_BanCallOut (F_Phone) values (@F_Phone)";
-            return DbHelperSQL.ExecuteSql(sql, new SqlParameter("@F_Phone", model.F_Phone));
+            var sql = "insert into T_Call_BanCallOut (F_Phone,F_Remark) values (@F_Phone,@F_Remark)";
+            return DbHelperSQL.ExecuteSql(sql, new SqlParameter[] {
+                new SqlParameter("@F_Phone", model.F_Phone),
+                new SqlParameter("@F_Remark", model.F_Remark)
+            });
         }
 
         public int DeleteBatch(string ids)
         {
-            var sql = $"delete form T_Call_BanCallOut where F_Id in ({ids}) ";
+            var sql = $"delete from T_Call_BanCallOut where F_Id in ({ids}) ";
             return DbHelperSQL.ExecuteSql(sql);
         }
 
         public Model.T_Call_BanCallOut GetModel(string phone)
         {
             Model.T_Call_BanCallOut model = new Model.T_Call_BanCallOut();
-            var sql = "select F_Id,F_Phone,F_SetTime from T_Call_BanCallOut WHERE F_Phone=@F_Phone";
-            var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Phone", phone)).Tables[0];
+            var sql = "select F_Id,F_Phone,F_SetTime,F_Remark from T_Call_BanCallOut WHERE F_Phone=@F_Phone";
+            var dt = DbHelperSQL.Query(sql, new SqlParameter("@F_Phone", model.F_Phone)).Tables[0];
             if (dt.Rows.Count > 0)
             {
                 model.Id = dt.Rows[0]["F_Id"] == DBNull.Value ? 0 : Convert.ToInt32(dt.Rows[0]["F_Id"]);
                 model.F_Phone = dt.Rows[0]["F_Phone"] == DBNull.Value ? "" : dt.Rows[0]["F_Phone"].ToString();
                 model.F_SetTime = dt.Rows[0]["F_SetTime"] == DBNull.Value ? null : (DateTime?)Convert.ToDateTime(dt.Rows[0]["F_Phone"].ToString());
+                model.F_Remark = dt.Rows[0]["F_Remark"] == DBNull.Value ? "" : dt.Rows[0]["F_Remark"].ToString();
                 return model;
             }
             return null;

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/DictionaryController.cs

@@ -12,7 +12,7 @@ using System.Web.Mvc;
 
 namespace CallCenterApi.Interface.Controllers
 {
-    
+
     public class DictionaryController : BaseController
     {
         private BLL.T_Sys_DictionaryBase dictionaryBaseBLL = new BLL.T_Sys_DictionaryBase();
@@ -93,10 +93,12 @@ namespace CallCenterApi.Interface.Controllers
             {
                 Model.T_Sys_DictionaryBase orderModel = new Model.T_Sys_DictionaryBase();
                 BLL.T_Sys_DictionaryBase orderBll = new BLL.T_Sys_DictionaryBase();
-
+                Model.T_Sys_DictionaryBase model = orderBll.GetModel(input.DicFlag);
+                if (model != null)
+                    return Error("字典对象已存在");
                 orderModel.F_DictionaryFlag = input.DicFlag;
-                orderModel.F_DictionaryName = input.Name;
-                orderModel.F_Describe = input.Remark;
+                orderModel.F_DictionaryName = input.DicName;
+                orderModel.F_Describe = input.DicRemark;
                 orderModel.F_State = true;
                 orderModel.F_Sort = input.Sort;
 
@@ -123,9 +125,8 @@ namespace CallCenterApi.Interface.Controllers
                 Model.T_Sys_DictionaryBase orderModel = orderBll.GetModel(input.DicFlag);
                 if (orderModel == null)
                     return Error("字典对象不存在");
-                orderModel.F_DictionaryFlag = input.DicFlag;
-                orderModel.F_DictionaryName = input.Name;
-                orderModel.F_Describe = input.Remark;
+                orderModel.F_DictionaryName = input.DicName;
+                orderModel.F_Describe = input.DicRemark;
                 orderModel.F_Sort = input.Sort;
                 if (orderBll.Update(orderModel))
                     res = Success("字典添加成功");
@@ -167,7 +168,7 @@ namespace CallCenterApi.Interface.Controllers
         //获取字典值列表
         public ActionResult GetDicValueList(FilterDictionary filter)
         {
-             ActionResult res = NoToken("未知错误，请重新登录");
+            ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
                 string sql = "";

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -176,7 +176,7 @@ namespace CallCenterApi.Interface.Controllers
                 //    return Error("密码必须为6-16个字符，大、小写字母和数字的组合");
 
 
-                var model = sysUserAccountBll.GetModel(int.Parse(input.Usercode));
+                var model = sysUserAccountBll.GetModel(input.Usercode);
                 if (model != null)
                     return Error("当前员工工号存在，请更换！");
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/BanCallOutController.cs

@@ -31,7 +31,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                              "F_Id",
                              "*",
                              sb.ToString(),
-                             "ORDER BY SetTime desc",
+                             "ORDER BY F_ID desc",
                              filter.PageSize,
                              filter.PageIndex,
                              true,
@@ -47,11 +47,15 @@ namespace CallCenterApi.Interface.Controllers.callout
 
         public ActionResult Add(BanCallOutInput input)
         {
-            if (!string.IsNullOrWhiteSpace(input.Phone))
+            if (string.IsNullOrWhiteSpace(input.Phone))
                 return Error("号码不可为空");
+            var model = banCallOutBLL.GetModel(input.Phone);
+            if (model != null)
+                return Error("该号码已被限制外呼");
             if (banCallOutBLL.Add(new Model.T_Call_BanCallOut()
             {
-                F_Phone = input.Phone
+                F_Phone = input.Phone,
+                F_Remark = input.Remark
             }) > 0)
                 return Success("添加成功");
             return Error("添加失败");

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/callout/CallPlanController.cs

@@ -53,15 +53,15 @@ namespace CallCenterApi.Interface.Controllers.callout
 
             var roleid = CurrentUser.UserData.F_RoleId;
             var deptid = CurrentUser.UserData.F_DeptId;
-            var deptcode = CurrentUser.UserData.F_DeptCode;
+            var deptCode = CurrentUser.UserData.F_DeptCode;
             var usercode = CurrentUser.UserData.F_UserCode;
             if (roleid != 0)
             {
                 if (roleid != 17)
                 {
-                    if (deptcode.IndexOf("|1|") > 0)
+                    if (deptCode.Replace("|0|1|", "").Length > 0)
                     {
-                        sql += " and DeptId in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%') ";
+                        sql += " and DeptId in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptCode + "%') ";
                     }
                 }
             }
@@ -602,7 +602,7 @@ namespace CallCenterApi.Interface.Controllers.callout
 
             var recordCount = 0;
             var dt = BLL.PagerBLL.GetListPager(
-                             " T_Call_TaskTelNum tn left join T_CTI_Task t on t.TaskID=tn.F_TaskId ",
+                             " T_Call_TaskTelNum tn left join T_CTI_Task t on t.TaskID=tn.F_TaskId left join T_Call_CallRecords c on c.TaskType=9 and c.TaskPhoneID=tn.F_Id and c.TaskID=tn.F_TaskId ",
                              " F_Id ",
                              field,
                              " and F_TaskId=" + filter.Id + sql,
@@ -659,6 +659,9 @@ namespace CallCenterApi.Interface.Controllers.callout
                 case 2://我的任务结果
                     sql += $" and F_HCState=1 ";
                     break;
+                case 3://任务结果数据
+
+                    break;
                 default:
                     break;
             }
@@ -721,6 +724,123 @@ namespace CallCenterApi.Interface.Controllers.callout
             };
             return Content(obj.ToJson());
         }
+
+        public ActionResult GetPhoneResult(FilterCallPhone filter)
+        {
+            var headList1 = new List<string>() { "序号", "外呼计划", "号码Id", "号码", "分配坐席", "呼叫状态", "接通状态", "呼叫结果", "结果反馈", "导入时间", "呼出时间" };
+            //根据任务id查问卷
+            var task = taskBLL.GetModel(filter.Id);
+            if (task == null)
+                return Error("该任务不存在");
+            var headDt = DbHelperSQL.Query($"select Q.F_TITLE from T_Ask_Question Q  LEFT JOIN T_Ask_PagerItems PIT ON PIT.F_QuestionId = Q.F_QuestionId LEFT JOIN T_Ask_PagerInfo PIN ON PIN.F_PagerId = PIT.F_PagerId LEFT JOIN T_CTI_Task T ON T.y_TkModelId = PIN.F_PagerId where T.TaskID ={task.TaskID} ORDER BY Q.F_SortModel").Tables[0];
+            var headList2 = new List<string>();
+            foreach (DataRow row in headDt.Rows)
+            {
+                headList2.Add(row["F_TITLE"]?.ToString() ?? "");
+            }
+
+            var headList = new List<string>();
+            headList.AddRange(headList1);
+            headList.AddRange(headList2);
+
+
+            //查询数据
+            var sql = "";
+            if (filter.Id > 0)
+            {
+                var model = taskBLL.GetModel(filter.Id);
+                sql += " and F_TaskId=" + filter.Id;
+                if (model == null)
+                    return Error("外呼任务不存在");
+            }
+            if (!string.IsNullOrWhiteSpace(filter.Phone))
+            {
+                sql += $" and F_Phone like '%{filter.Phone}%'";
+            }
+            if (filter.FPState > -1)
+            {
+                sql += $" and F_FPState={filter.FPState} ";
+            }
+            if (filter.HCState > -1)
+            {
+                sql += $" and F_HCState={filter.HCState} ";
+            }
+            if (filter.YJState > -1)
+            {
+                sql += $" and F_YJState={filter.YJState} ";
+            }
+            if (filter.YHFKID > -1)
+            {
+                sql += $" and F_YHFKID={filter.YHFKID} ";
+            }
+            if (filter.HJJGID > -1)
+            {
+                sql += $" and F_HJJGID={filter.HJJGID} ";
+            }
+            var field = "F_Id,t.TaskName,F_Phone,F_FPState,F_HCState,F_YJState,F_Username,tn.F_CreateTime,F_HJJGName,F_YHFKName";
+            var recordCount = 0;
+            var dt = BLL.PagerBLL.GetListPager(
+                             " T_Call_TaskTelNum tn left join T_CTI_Task t on t.TaskID=tn.F_TaskId",
+                             " F_Id ",
+                             field,
+                              sql,
+                             "ORDER BY F_LastCallTime desc,F_ID DESC ",
+                             filter.PageSize,
+                             filter.PageIndex,
+                             true,
+                             out recordCount);
+            List<Model.T_Call_TaskTelNum> modelList = new BLL.T_Call_TaskTelNum().DataTableToListForShow(dt);
+
+            List<Model.T_Call_Answers> answerList = new List<T_Call_Answers>();
+            if (modelList.Count > 0)
+            {
+                answerList = ansBLL.DataTableToListDTO(DbHelperSQL.Query($" select A.F_QID, A.F_CusTelID, A.F_Answer from T_Call_Answers A LEFT JOIN T_Ask_Question Q ON Q.F_QuestionId=A.F_QID where F_TaskID={ task.TaskID} AND F_CusTelID in ({ string.Join(", ", string.Join(", ", modelList.Select(x => x.F_Id).ToArray()))}) ORDER BY Q.F_SortModel  ").Tables[0]);
+            }
+
+            var numList = modelList.Select(x => new
+            {
+                id = x.F_Id.ToString(),
+                taskname = x.TaskName,
+                phone = x.F_Phone,
+                agent = string.IsNullOrWhiteSpace(x.F_UserName) ? "" : x.F_UserName,
+                isallot = x.F_FPState == null ? "" : (x.F_FPState > 0 ? "已分配" : "未分配"),
+                iscalled = x.F_HCState > 0 ? "已呼叫" : "未呼叫",
+                isconnected = x.F_YJState > 0 ? "已接通" : "未接通",
+                hjjg = x.F_HJJGName,
+                yhfk = x.F_YHFKName,
+                createtime = Convert.ToDateTime(x.F_CreateTime).ToString("yyyy-MM-dd HH:mm:ss"),
+                lastcalltime = x.F_LastCallTime == null ? "" : Convert.ToDateTime(x.F_LastCallTime).ToString("yyyy-MM-dd HH:mm:ss")
+            });
+
+
+            var dataList = new List<List<string>>();
+
+            foreach (var item in numList)
+            {
+                var answer = answerList.Where(x => (x.F_CusTelID?.ToString() ?? "") == item.id).GroupBy(x => x.F_QID).ToList();
+                var itemList = new List<string>();
+                itemList.AddRange(new string[] { item.id, item.taskname, item.phone, item.agent, item.isallot, item.iscalled, item.isconnected, item.hjjg, item.yhfk, item.createtime, item.lastcalltime });
+                foreach (var i in answer)
+                {
+                    itemList.Add(string.Join(", ", i.Where(x => !string.IsNullOrWhiteSpace(x.F_Answer)).Select(x => x.F_Answer).Distinct()));
+                }
+                dataList.Add(itemList);
+            }
+
+
+
+
+
+
+
+            return Success("获取成功", new
+            {
+                headlist = headList,
+                datalist = dataList
+            });
+        }
+
+
         /// <summary>
         /// 坐席自主获取号码(点击外呼分配号码）
         /// </summary>
@@ -771,16 +891,16 @@ namespace CallCenterApi.Interface.Controllers.callout
         {
             var roleid = CurrentUser.UserData.F_RoleId;
             var deptid = CurrentUser.UserData.F_DeptId;
-            var deptcode = CurrentUser.UserData.F_DeptCode;
+            var deptCode = CurrentUser.UserData.F_DeptCode;
             var usercode = CurrentUser.UserData.F_UserCode;
             var sql = "";
             if (roleid != 0)
             {
                 if (roleid != 17)
                 {
-                    if (deptcode.IndexOf("|1|") > 0)
+                    if (deptCode.Replace("|0|1|", "").Length > 0)
                     {
-                        sql += " and DeptId in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%') ";
+                        sql += " and DeptId in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptCode + "%') ";
                     }
                 }
             }
@@ -1029,6 +1149,8 @@ namespace CallCenterApi.Interface.Controllers.callout
             }
             return Error("获取详情失败");
         }
+
+
         #endregion
 
         #region 导入导出号码

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/quality/QCManageController.cs

@@ -41,7 +41,7 @@ namespace CallCenterApi.Interface.Controllers.quality
             {
                 if (roleId != 17)
                 {
-                    if (deptCode.IndexOf("|1|") > 0)
+                    if (deptCode.Replace("|0|1|", "").Length > 0)
                     {
                         if (roleId == 36 || roleId == 38 || roleId == 40)
                         {
@@ -53,6 +53,13 @@ namespace CallCenterApi.Interface.Controllers.quality
                         }
 
                     }
+                    else
+                    {
+                        if (roleId != 53 && roleId != 54)
+                        {
+                            sql += $" and  UserCode  in (SELECT F_UserCode FROM T_Sys_UserAccount WHERE F_DeptId={deptId})";
+                        }
+                    }
                 }
             }
 
@@ -195,7 +202,7 @@ namespace CallCenterApi.Interface.Controllers.quality
             {
                 if (roleId != 17)
                 {
-                    if (deptCode.IndexOf("|1|") > 0)
+                    if (deptCode.Replace("|0|1|", "").Length > 0)
                     {
                         if (roleId == 36 || roleId == 38 || roleId == 40)
                         {
@@ -207,6 +214,13 @@ namespace CallCenterApi.Interface.Controllers.quality
                         }
 
                     }
+                    else
+                    {
+                        if (roleId != 53 && roleId != 54)
+                        {
+                            sql += $" and  UserCode  in (SELECT F_UserCode FROM T_Sys_UserAccount WHERE F_DeptId={deptId})";
+                        }
+                    }
                 }
             }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TalkTimeController.cs

@@ -349,7 +349,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 sql += " and CallState=" + state.Trim();
             }
 
-            DataTable dt = DbHelperSQL.Query("SELECT UserId,UserCode,UserName,COUNT(*) AS calloutCount FROM T_Call_CallRecords where 1=1 " + sql + "  GROUP BY UserId,UserCode,UserName").Tables[0];
+            DataTable dt = DbHelperSQL.Query("SELECT UserId,UserCode,UserName,COUNT(*) AS calloutCount FROM T_Call_CallRecords where 1=1 " + sql + "  GROUP BY UserId,UserCode,UserName  having UserCode <> '0' ").Tables[0];
             Dictionary<string, int> myDictionary = new Dictionary<string, int>();
 
             foreach (Model.T_Sys_UserAccount item in userAccountList)

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TotalCallController.cs

@@ -59,7 +59,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (roleId != 17)
                     {
-                        if (deptCode.IndexOf("|1|") > 0)
+                        if (deptCode.Replace("|0|1|", "").Length > 0)
                         {
                             if (roleId == 36 || roleId == 38 || roleId == 40)
                             {
@@ -252,7 +252,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (roleId != 17)
                     {
-                        if (deptCode.IndexOf("|1|") > 0)
+                        if (deptCode.Replace("|0|1|", "").Length > 0)
                         {
                             if (roleId == 36 || roleId == 38 || roleId == 40)
                             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/YearContrastController.cs

@@ -174,7 +174,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 {
                     if (roleId != 17)
                     {
-                        if (deptCode.IndexOf("|1|") > 0)
+                        if (deptCode.Replace("|0|1|", "").Length > 0)
                         {
                             if (roleId == 36 || roleId == 38 || roleId == 40)
                             {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/ZuoXiWorkTotalController.cs

@@ -18,7 +18,7 @@ namespace CallCenterApi.Interface.Controllers.report
         {
             ActionResult res = NoToken("未知错误，请重新登录");
 
-            String[] str = { "部门", "坐席", "坐席工号", "呼入电话数", "坐席接通量", "呼损量"
+            String[] str = { "部门", "坐席", "坐席工号","角色" ,"呼入电话数", "坐席接通量", "呼损量"
                         ,"接通率","呼损率","平均排队时间","接听通话次数","通话分钟数","通话秒数"
                         ,"平均接听通话秒数","平均振铃秒数","呼入占有率","用户评价","坐席登录次数"
                         ,"登录时长分钟数","工作时长分钟数","平均每天工作时长（小时）","平均操作分钟数"
@@ -414,6 +414,7 @@ namespace CallCenterApi.Interface.Controllers.report
             DataColumn dc1 = new DataColumn("部门");
             DataColumn dc2 = new DataColumn("坐席");
             DataColumn dc3 = new DataColumn("坐席工号");
+            DataColumn dc3_ = new DataColumn("角色");
             DataColumn dc4 = new DataColumn("呼入电话数");
             DataColumn dc5 = new DataColumn("坐席接通量");
             DataColumn dc6 = new DataColumn("呼损量");
@@ -441,6 +442,7 @@ namespace CallCenterApi.Interface.Controllers.report
             dtNew.Columns.Add(dc1);
             dtNew.Columns.Add(dc2);
             dtNew.Columns.Add(dc3);
+            dtNew.Columns.Add(dc3_);
             dtNew.Columns.Add(dc4);
             dtNew.Columns.Add(dc5);
             dtNew.Columns.Add(dc6);
@@ -525,10 +527,18 @@ namespace CallCenterApi.Interface.Controllers.report
                     {
                         usercodeSQL += $" and F_UserCode='{usercode}'";
                     }
-                    else
+                    else if (deptId != 1)
                     {
                         deptSQL += $" and F_DeptId={deptId} ";
                     }
+                    else
+                    {
+                        if (roleId != 53 && roleId != 54)
+                        {
+                            deptSQL += $" and F_DeptId={deptId} ";
+                        }
+
+                    }
 
                 }
             }
@@ -547,7 +557,7 @@ namespace CallCenterApi.Interface.Controllers.report
             foreach (DataRow dr in dtdpt.Rows)
             {
                 DataTable dt = new DataTable();
-                string sql = $"SELECT F_UserCode,F_UserName,F_WorkNumber,F_UserId FROM T_Sys_UserAccount where f_seatFlag=1 and F_DeptId={dr["F_DeptId"]} and F_WorkNumber!='' {usercodeSQL} order by  F_WorkNumber asc";
+                string sql = $"SELECT F_UserCode,F_UserName,F_WorkNumber,F_UserId,T_Sys_RoleInfo.F_RoleName FROM T_Sys_UserAccount left join T_Sys_RoleInfo on T_Sys_RoleInfo.F_RoleId=T_Sys_UserAccount.F_RoleId where f_seatFlag=1 and F_DeptId={dr["F_DeptId"]} and F_WorkNumber!='' {usercodeSQL} order by  F_WorkNumber asc";
                 dt = DbHelperSQL.Query(sql).Tables[0];
                 for (int i = 0; i < dt.Rows.Count; i++)
                 {
@@ -557,6 +567,7 @@ namespace CallCenterApi.Interface.Controllers.report
                         drNew["部门"] = dr["F_DeptName"].ToString();
                         drNew["坐席"] = dt.Rows[i]["F_UserName"].ToString();
                         drNew["坐席工号"] = dt.Rows[i]["F_WorkNumber"].ToString();
+                        drNew["角色"] = dt.Rows[i]["F_RoleName"].ToString();
                         //if (i == 0)
                         //{//呼入电话
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -21,63 +21,63 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    int userId = CurrentUser.UserData.F_UserId;
-                    if (userId != 0)
+
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
                     {
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                        if (ua != null)
+                        string tel = HttpUtility.UrlDecode(RequestString.GetFormString("tel"));
+                        string callid = HttpUtility.UrlDecode(RequestString.GetFormString("callid"));
+                        int n = RequestString.GetInt("num", 0);
+                        int type = RequestString.GetInt("type", 0);
+                        Model.T_Call_Blacklist dModel = new BLL.T_Call_Blacklist().GetModelList(" F_TelPhone='" + tel + "' ").FirstOrDefault();
+
+                        var date = DateTime.Now;
+                        var enddate = date;
+                        switch (type)
+                        {
+                            case 1: enddate = enddate.AddDays(n); break;
+                            case 2: enddate = enddate.AddHours(n); break;
+                            case 3: enddate = enddate.AddMinutes(n); break;
+                            case 4: enddate = DateTime.MaxValue; break;
+                        }
+                        if (dModel == null)
                         {
-                            string tel = HttpUtility.UrlDecode(RequestString.GetFormString("tel"));
-                            string callid = HttpUtility.UrlDecode(RequestString.GetFormString("callid"));
-                            int n = RequestString.GetInt("num", 0);
-                            int type = RequestString.GetInt("type", 0);
-                            Model.T_Call_Blacklist dModel = new BLL.T_Call_Blacklist().GetModelList(" F_TelPhone='" + tel + "' ").FirstOrDefault();
-
-                            var date = DateTime.Now;
-                            var enddate = date;
-                            switch (type)
+                            dModel = new Model.T_Call_Blacklist();
+                            dModel.F_CallId = callid;
+                            dModel.F_TelPhone = tel.Trim();
+                            dModel.F_SetTime = date;
+                            dModel.F_RemoveTime = enddate;
+                            dModel.F_InterceptNum = 1;
+                            dModel.F_UserId = ua.F_UserId;
+                            int b = new BLL.T_Call_Blacklist().Add(dModel);
+                            if (b > 0)
                             {
-                                case 1: enddate = enddate.AddDays(n); break;
-                                case 2: enddate = enddate.AddHours(n); break;
-                                case 3: enddate = enddate.AddMinutes(n); break;
-                                case 4: enddate = DateTime.MaxValue; break;
+                                res = Success("添加成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
                             }
-                            if (dModel == null)
+                            else
                             {
-                                dModel = new Model.T_Call_Blacklist();
-                                dModel.F_CallId = callid;
-                                dModel.F_TelPhone = tel.Trim();
-                                dModel.F_SetTime = date;
-                                dModel.F_RemoveTime = enddate;
-                                dModel.F_InterceptNum = 1;
-                                dModel.F_UserId = ua.F_UserId;
-                                int b = new BLL.T_Call_Blacklist().Add(dModel);
-                                if (b > 0)
-                                {
-                                    res = Success("添加成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
-                                }
-                                else
-                                {
-                                    res = Error("添加失败");
-                                }
+                                res = Error("添加失败");
+                            }
+                        }
+                        else
+                        {
+
+                            dModel.F_RemoveTime = enddate;
+                            if (new BLL.T_Call_Blacklist().Update(dModel))
+                            {
+                                res = Success("修改成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
                             }
                             else
                             {
-
-                                dModel.F_RemoveTime = enddate;
-                                if (new BLL.T_Call_Blacklist().Update(dModel))
-                                {
-                                    res = Success("修改成功", enddate.ToString("yyyy-MM-dd HH:mm:ss"));
-                                }
-                                else
-                                {
-                                    res = Error("修改失败");
-                                }
+                                res = Error("修改失败");
                             }
                         }
                     }
-              
+                }
+
             }
             return res;
         }
@@ -293,17 +293,17 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                 }
 
-                int hrcount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=0 "+ sqlcount);
-                int hccount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=1 "+ sqlcount);
-                
+                int hrcount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=0 " + sqlcount);
+                int hccount = new BLL.T_Call_CallRecords().GetRecordCount(" calltype=1 " + sqlcount);
+
                 var obj = new
                 {
                     state = "success",
                     message = "成功",
                     rows = dt,
                     total = recordCount,
-                    hrcount=hrcount,
-                    hccount=hccount,
+                    hrcount = hrcount,
+                    hccount = hccount,
                 };
 
                 res = Content(obj.ToJson());
@@ -354,34 +354,34 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-               
-                    int userId = CurrentUser.UserData.F_UserId;
-                    if (userId != 0)
+
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (ua != null)
                     {
-                        Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                        if (ua != null)
-                        {
-                            Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
-                            model.CallId = RequestString.GetFormString("callid");
-                            model.UserId = ua.F_UserId;
-                            model.UserCode = ua.F_UserCode;
-                            model.UserName = ua.F_UserName;
+                        Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
+                        model.CallId = RequestString.GetFormString("callid");
+                        model.UserId = ua.F_UserId;
+                        model.UserCode = ua.F_UserCode;
+                        model.UserName = ua.F_UserName;
                         //model.ExtNumber = ua.F_WorkNumber;
                         model.ExtNumber = CurrentUser.UserData.F_ExtensionNumber;
 
-                            model.DealType = 5;
-                            bool bl = new BLL.T_Call_CallRecords().UpdateCallInRingTelRecord(model);
-                            if (bl)
-                            {
-                                res = Success("更新振铃状态成功");
-                            }
-                            else
-                            {
-                                res = Error("更新振铃状态失败");
-                            }
+                        model.DealType = 5;
+                        bool bl = new BLL.T_Call_CallRecords().UpdateCallInRingTelRecord(model);
+                        if (bl)
+                        {
+                            res = Success("更新振铃状态成功");
+                        }
+                        else
+                        {
+                            res = Error("更新振铃状态失败");
                         }
                     }
-            
+                }
+
             }
             return res;
         }
@@ -405,11 +405,16 @@ namespace CallCenterApi.Interface.Controllers.tel
                 {
                     Model.T_Call_CallRecords vmodel = new BLL.T_Call_CallRecords().GetModelByCallId(model.CallId);
                     string type = vmodel.OperateType.ToString();
+                    //这里不知道  vmodel.OperateType=7 是什么时候. 
                     if (type == "7")
                     {
                         new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.OperateObject.ToString()), 1);
                     }
-
+                    //所以暂时先用  vmodel.TaskPhoneID 来判断是否是点击外呼的通话记录
+                    if (!string.IsNullOrWhiteSpace(vmodel.TaskPhoneID))
+                    {
+                        new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.TaskPhoneID.ToString()), 1);
+                    }
                     res = Success("更新摘机状态成功");
                 }
                 else

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

@@ -22,7 +22,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                 DataTable dt = new DataTable();
                 int roleid = CurrentUser.UserData.F_RoleId;
                 int deptid = CurrentUser.UserData.F_DeptId;
-                string deptcode = CurrentUser.UserData.F_DeptCode;
+                string deptCode = CurrentUser.UserData.F_DeptCode;
                 string callstate = HttpUtility.UrlDecode(RequestString.GetQueryString("callstate"));
                 string calltype = HttpUtility.UrlDecode(RequestString.GetQueryString("calltype"));
                 string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
@@ -43,7 +43,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                     if (roleid != 17)
                     {
                         //各分公司
-                        if (deptcode.IndexOf("|1|") > 0)
+                        if (deptCode.Replace("|0|1|", "").Length > 0)
                         {
                             if (roleid == 36 || roleid == 38 || roleid == 40)
                             {
@@ -52,7 +52,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                             }
                             else
                             {
-                                sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%')) ";
+                                sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptCode + "%')) ";
                             }
                         }
                         //总公司

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterBanCallOut.cs

@@ -10,7 +10,6 @@ namespace CallCenterApi.Interface.Models.Filter
     {
         public string Phone { get; set; }
         public DateTime? Start { get; set; }
-        public DateTime? End { get; set; }
 
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/BanCallOutInput.cs

@@ -8,6 +8,6 @@ namespace CallCenterApi.Interface.Models.Input
     public class BanCallOutInput
     {
         public string Phone { get; set; }
-
+        public string Remark { get; set; }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/DictionaryInput.cs

@@ -8,9 +8,9 @@ namespace CallCenterApi.Interface.Models.Input
     public class DictionaryBaseInput
     {
         public string DicFlag { get; set; }
-        public string Name { get; set; }
+        public string DicName { get; set; }
         public int Sort { get; set; } = 0;
-        public string Remark { get; set; }
+        public string DicRemark { get; set; }
 
     }
 

CallCenterApi/CallCenterApi.Model/T_Call_BanCallOut.cs

@@ -11,5 +11,6 @@ namespace CallCenterApi.Model
         public int Id { get; set; }
         public string F_Phone { get; set; }
         public DateTime? F_SetTime { get; set; }
+        public string F_Remark { get; set; }
     }
 }