Merge branch 'master' of http://192.168.1.222:3000/yuqian/ZYKJ_API

CallCenterApi/CallCenterApi.BLL/T_CTI_Task.cs

@@ -282,9 +282,12 @@ namespace CallCenterApi.BLL
                     {
                         model.DeptId = Convert.ToInt32(dt.Rows[n]["DeptId"].ToString());
                     }
-                    if (dt.Rows[n]["AddAgentId"] != null && dt.Rows[n]["AddAgentId"].ToString() != "")
+                    if (dt.Columns.Contains("AddAgentId"))
                     {
-                        model.AddAgentId = Convert.ToInt32(dt.Rows[n]["AddAgentId"].ToString());
+                        if (dt.Rows[n]["AddAgentId"] != null && dt.Rows[n]["AddAgentId"].ToString() != "")
+                        {
+                            model.AddAgentId = Convert.ToInt32(dt.Rows[n]["AddAgentId"].ToString());
+                        }
                     }
                     modelList.Add(model);
                 }

CallCenterApi/CallCenterApi.DAL/T_Sys_WorkTimes.cs

@@ -38,27 +38,22 @@ namespace CallCenterApi.DAL
         {
             StringBuilder strSql = new StringBuilder();
             strSql.Append("insert into T_Sys_WorkTimes(");
-            strSql.Append("F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn)");
+            strSql.Append("F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId)");
             strSql.Append(" values (");
-            strSql.Append("@F_WorkStartTimes,@F_WorkEndTimes,@F_TimeName,@F_Remark,@F_UserID,@F_UserCode,@F_UserName,@F_CreateOn)");
+            strSql.Append("@F_WorkStartTimes,@F_WorkEndTimes,@F_TimeName,@F_Remark,@F_DeptId)");
             strSql.Append(";select @@IDENTITY");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
                     new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
                     new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_UserID", SqlDbType.Int,4),
-                    new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime)};
+                    new SqlParameter("@F_DeptId", SqlDbType.Int,4)
+            };
             parameters[0].Value = model.F_WorkStartTimes;
             parameters[1].Value = model.F_WorkEndTimes;
             parameters[2].Value = model.F_TimeName;
             parameters[3].Value = model.F_Remark;
-            parameters[4].Value = model.F_UserID;
-            parameters[5].Value = model.F_UserCode;
-            parameters[6].Value = model.F_UserName;
-            parameters[7].Value = model.F_CreateOn;
+            parameters[4].Value = model.F_DeptId;
 
             object obj = DbHelperSQL.GetSingle(strSql.ToString(), parameters);
             if (obj == null)
@@ -81,30 +76,21 @@ namespace CallCenterApi.DAL
             strSql.Append("F_WorkEndTimes=@F_WorkEndTimes,");
             strSql.Append("F_TimeName=@F_TimeName,");
             strSql.Append("F_Remark=@F_Remark,");
-            strSql.Append("F_UserID=@F_UserID,");
-            strSql.Append("F_UserCode=@F_UserCode,");
-            strSql.Append("F_UserName=@F_UserName,");
-            strSql.Append("F_CreateOn=@F_CreateOn");
+            strSql.Append("F_DeptId=@F_DeptId,");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_WorkStartTimes", SqlDbType.DateTime),
                     new SqlParameter("@F_WorkEndTimes", SqlDbType.DateTime),
                     new SqlParameter("@F_TimeName", SqlDbType.NVarChar,100),
                     new SqlParameter("@F_Remark", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_UserID", SqlDbType.Int,4),
-                    new SqlParameter("@F_UserCode", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_UserName", SqlDbType.VarChar,50),
-                    new SqlParameter("@F_CreateOn", SqlDbType.DateTime),
+                    new SqlParameter("@F_DeptId", SqlDbType.Int,4),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkStartTimes;
             parameters[1].Value = model.F_WorkEndTimes;
             parameters[2].Value = model.F_TimeName;
             parameters[3].Value = model.F_Remark;
-            parameters[4].Value = model.F_UserID;
-            parameters[5].Value = model.F_UserCode;
-            parameters[6].Value = model.F_UserName;
-            parameters[7].Value = model.F_CreateOn;
-            parameters[8].Value = model.F_ID;
+            parameters[4].Value = model.F_DeptId;
+            parameters[5].Value = model.F_ID;
 
             int rows = DbHelperSQL.ExecuteSql(strSql.ToString(), parameters);
             if (rows > 0)
@@ -168,7 +154,7 @@ namespace CallCenterApi.DAL
         {
 
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select  top 1 F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn from T_Sys_WorkTimes ");
+            strSql.Append("select  top 1 F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId from T_Sys_WorkTimes ");
             strSql.Append(" where F_ID=@F_ID");
             SqlParameter[] parameters = {
                     new SqlParameter("@F_ID", SqlDbType.Int,4)
@@ -216,22 +202,11 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Remark = row["F_Remark"].ToString();
                 }
-                if (row["F_UserID"] != null && row["F_UserID"].ToString() != "")
-                {
-                    model.F_UserID = int.Parse(row["F_UserID"].ToString());
-                }
-                if (row["F_UserCode"] != null)
-                {
-                    model.F_UserCode = row["F_UserCode"].ToString();
-                }
-                if (row["F_UserName"] != null)
-                {
-                    model.F_UserName = row["F_UserName"].ToString();
-                }
-                if (row["F_CreateOn"] != null && row["F_CreateOn"].ToString() != "")
+                if (row["F_DeptId"] != null && row["F_DeptId"].ToString() != "")
                 {
-                    model.F_CreateOn = DateTime.Parse(row["F_CreateOn"].ToString());
+                    model.F_DeptId = int.Parse(row["F_DeptId"].ToString());
                 }
+
             }
             return model;
         }
@@ -242,7 +217,7 @@ namespace CallCenterApi.DAL
         public DataSet GetList(string strWhere)
         {
             StringBuilder strSql = new StringBuilder();
-            strSql.Append("select F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
+            strSql.Append("select F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId ");
             strSql.Append(" FROM T_Sys_WorkTimes ");
             if (strWhere.Trim() != "")
             {
@@ -262,7 +237,7 @@ namespace CallCenterApi.DAL
             {
                 strSql.Append(" top " + Top.ToString());
             }
-            strSql.Append(" F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_UserID,F_UserCode,F_UserName,F_CreateOn ");
+            strSql.Append(" F_ID,F_WorkStartTimes,F_WorkEndTimes,F_TimeName,F_Remark,F_DeptId  ");
             strSql.Append(" FROM T_Sys_WorkTimes ");
             if (strWhere.Trim() != "")
             {

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

@@ -221,6 +221,7 @@ namespace CallCenterApi.Interface.Controllers.callout
                 connectedagentrate = connectedAgentRate,             //转坐席率    
             });
         }
+        [Authority]
         /// <summary>
         /// 添加/修改
         /// </summary>
@@ -623,6 +624,7 @@ namespace CallCenterApi.Interface.Controllers.callout
             {
                 rows = modelList.Select(x => new
                 {
+                    id = x.F_Id,
                     taskname = x.TaskName,
                     phone = x.F_Phone,
                     agent = string.IsNullOrWhiteSpace(x.F_UserName) ? "" : x.F_UserName,
@@ -733,7 +735,12 @@ namespace CallCenterApi.Interface.Controllers.callout
             return Content(obj.ToJson());
         }
 
-        public ActionResult GetPhoneResult(FilterCallPhone filter)
+        /// <summary>
+        /// 任务结果查询-自定义列表头
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        public ActionResult GetPhoneResultHead(FilterCallPhone filter)
         {
             var headList1 = new List<string>() { "序号", "外呼计划", "号码Id", "号码", "分配坐席", "呼叫状态", "接通状态", "呼叫结果", "结果反馈", "导入时间", "呼出时间" };
             //根据任务id查问卷
@@ -750,10 +757,38 @@ namespace CallCenterApi.Interface.Controllers.callout
             var headList = new List<string>();
             headList.AddRange(headList1);
             headList.AddRange(headList2);
+            return Success("获取成功", new
+            {
+                headlist = headList
+            });
+        }
+        /// <summary>
+        /// 任务结果查询-自定义列数据
+        /// </summary>
+        /// <param name="filter"></param>
+        /// <returns></returns>
+        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 = "";
+            //var sql = " 1=1 ";
+            var sql = "  ";
             if (filter.Id > 0)
             {
                 var model = taskBLL.GetModel(filter.Id);
@@ -828,28 +863,55 @@ namespace CallCenterApi.Interface.Controllers.callout
                 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)
+                if (answer.Count() > 0)
+                {
+                    foreach (var i in answer)
+                    {
+                        itemList.Add(string.Join(", ", i.Where(x => !string.IsNullOrWhiteSpace(x.F_Answer)).Select(x => x.F_Answer).Distinct()));
+                    }
+                }
+                else
                 {
-                    itemList.Add(string.Join(", ", i.Where(x => !string.IsNullOrWhiteSpace(x.F_Answer)).Select(x => x.F_Answer).Distinct()));
+                    for (int i = 0; i < headList2.Count; i++)
+                    {
+                        itemList.Add("");
+                    }
                 }
                 dataList.Add(itemList);
             }
 
+            if (filter.IsExport)
+            {
+                NPOIHelper npoi = new NPOIHelper();
+                var msg1 = npoi.ExportToExcel(DateTime.Now.ToString("yyyyMMdd") + task.TaskName + "导出任务结果查询报表", dataList, headList.ToArray());
+                return !string.IsNullOrWhiteSpace(msg1) ? Error(msg1) : Success("导出成功");
+            }
 
 
-
-
-
-
-            return Success("获取成功", new
+            List<Dictionary<string, string>> result = new List<Dictionary<string, string>>();
+            for (int i = 0; i < dataList.Count(); i++)
             {
-                headlist = headList,
-                datalist = dataList,
-                recordcount = recordCount
-            });
+                Dictionary<string, string> dic = new Dictionary<string, string>();
+                for (int j = 0; j < dataList[i].Count(); j++)
+                {
+                    dic.Add("items" + j, dataList[i][j]);
+                }
+                result.Add(dic);
+            }
+            var obj = new
+            {
+                statusCode = 200,
+                code = 0,
+                msg = "",
+                rows = result,
+                total = recordCount
+            };
+
+            return Content(obj.ToJson(), "application/json");
         }
 
 
+
         /// <summary>
         /// 坐席自主获取号码(点击外呼分配号码）
         /// </summary>
@@ -885,15 +947,25 @@ namespace CallCenterApi.Interface.Controllers.callout
         /// </summary>
         /// <param name="ids"></param>
         /// <returns></returns>
+
+
         public ActionResult CancelPhone(int[] ids)
         {
             if (ids == null || ids.Length <= 0)
                 return Error("请选择");
             var arr = string.Join(",", ids);
+            var dt = DbHelperSQL.Query($"SELECT F_Id,F_FPState  from T_Call_TaskTelNum where F_FPState=0 and  F_ID in ({arr})");
+
+            if (dt != null && dt.Tables.Count > 0 && dt.Tables[0].Rows.Count > 0)
+                return Error("选中的选项中存在未分配的数据，无法取消");
+
             if (taskTellNumBLL.CancelFP(arr))
                 return Success("取消成功");
             return Error("取消失败");
         }
+
+
+
         /// <summary>
         /// 获取坐席可进行呼叫的点击外呼任务
         /// </summary>
@@ -1018,7 +1090,9 @@ namespace CallCenterApi.Interface.Controllers.callout
                 var task = taskBLL.GetModel(model.F_TaskId == null ? 0 : Convert.ToInt32(model.F_TaskId));
                 if (task != null)
                 {
-                    task.y_HCCount++;
+                    var obj = DbHelperSQL.GetSingle($"select COUNT(1) AS HC from T_Call_TaskTelNum   where F_TaskId={task.TaskID} AND F_HCState=1 ");
+                    task.y_HCCount = obj != null ? Convert.ToInt32(obj) : 0;
+
                     if (taskBLL.Update(task))
                         return Success("更新成功");
                     return Error("更新失败");
@@ -1029,6 +1103,9 @@ namespace CallCenterApi.Interface.Controllers.callout
 
         }
 
+
+
+
         #region 问卷回答
         /// <summary>
         /// 

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

@@ -29,8 +29,11 @@ namespace CallCenterApi.Interface.Controllers.quality
             string phone = HttpUtility.UrlDecode(RequestString.GetQueryString("phone"));
             string usercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
             string calltype = HttpUtility.UrlDecode(RequestString.GetQueryString("calltype"));
-            string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
-            string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+            //string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
+            //string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+
+            string starttime = DateTime.Now.ToString("yyyy-MM-hh ") + " 00:00:01";
+            string endtime = DateTime.Now.ToString("yyyy-MM-hh ") + " 23:59:59";
             string startl = HttpUtility.UrlDecode(RequestString.GetQueryString("startl"));
             string endl = HttpUtility.UrlDecode(RequestString.GetQueryString("endl"));
             string optid = HttpUtility.UrlDecode(RequestString.GetQueryString("optid"));
@@ -198,12 +201,15 @@ namespace CallCenterApi.Interface.Controllers.quality
             string phone = HttpUtility.UrlDecode(RequestString.GetQueryString("phone"));
             string usercode = HttpUtility.UrlDecode(RequestString.GetQueryString("usercode"));
             string calltype = HttpUtility.UrlDecode(RequestString.GetQueryString("calltype"));
-            string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
-            string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
+            //string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
+            //string endtime = HttpUtility.UrlDecode(RequestString.GetQueryString("endtime"));
             string startl = HttpUtility.UrlDecode(RequestString.GetQueryString("startl"));
             string endl = HttpUtility.UrlDecode(RequestString.GetQueryString("endl"));
             string optid = HttpUtility.UrlDecode(RequestString.GetQueryString("optid"));
 
+            string starttime = DateTime.Now.ToString("yyyy-MM-hh ") + " 00:00:01";
+            string endtime = DateTime.Now.ToString("yyyy-MM-hh ") + " 23:59:59";
+
             string strpageindex = RequestString.GetQueryString("page");
             int pageindex = 1;
             string strpagesize = RequestString.GetQueryString("pagesize");

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

@@ -456,23 +456,22 @@ namespace CallCenterApi.Interface.Controllers.tel
                     if (vmodel == null)
                         return Success("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);
-                        var taskid = new BLL.T_Call_TaskTelNum().GetModel(Convert.ToInt32(vmodel.TaskPhoneID.ToString()))?.F_TaskId ?? 0;
-                        var task = new BLL.T_CTI_Task().GetModel(taskid);
-                        if (taskid > 0)
-                        {
-                            task.y_YJCount++;
-                            new BLL.T_CTI_Task().Update(task);
-                        }
-                    }
+                    //if (!string.IsNullOrWhiteSpace(vmodel.TaskPhoneID))
+                    //{
+                    //    new BLL.T_Call_TaskTelNum().UpdateYJ(Convert.ToInt32(vmodel.TaskPhoneID.ToString()), 1);
+                    //    var taskid = new BLL.T_Call_TaskTelNum().GetModel(Convert.ToInt32(vmodel.TaskPhoneID.ToString()))?.F_TaskId ?? 0;
+                    //    var task = new BLL.T_CTI_Task().GetModel(taskid);
+                    //    if (taskid > 0)
+                    //    {
+                    //        task.y_YJCount++;
+                    //        new BLL.T_CTI_Task().Update(task);
+                    //    }
+                    //}
                     res = Success("更新摘机状态成功");
                 }
                 else

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

@@ -223,7 +223,11 @@ namespace CallCenterApi.Interface.Controllers.tel
                 }
                 if (dept != null && dept.Trim() != "")
                 {
-                    sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
+                    var deptModel = deptBLL.GetModel(!string.IsNullOrWhiteSpace(dept) ? Convert.ToInt32(dept) : 0);
+                    if (deptModel != null)
+                    {
+                        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 '{deptModel.F_DeptCode}%'))";
+                    }
                 }
                 if (phone != null && phone.Trim() != "")
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/WorkcalendarController.cs

@@ -12,6 +12,8 @@ namespace CallCenterApi.Interface.Controllers.tel
 {
     public class WorkcalendarController : BaseController
     {
+
+        private BLL.T_Sys_WorkTimes workTimesBLL = new BLL.T_Sys_WorkTimes();
         // 获取工作日历
         public ActionResult GetCalendarList(string strdate)
         {
@@ -54,64 +56,64 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    if (date != null && date != "")
+
+                if (date != null && date != "")
+                {
+                    DateTime dt = new DateTime();
+                    if (DateTime.TryParse(date, out dt))
                     {
-                        DateTime dt = new DateTime();
-                        if (DateTime.TryParse(date, out dt))
+                        Model.T_Sys_WorkCalendar wc = new BLL.T_Sys_WorkCalendar().GetModel(dt);
+                        if (wc != null)
                         {
-                            Model.T_Sys_WorkCalendar wc = new BLL.T_Sys_WorkCalendar().GetModel(dt);
-                            if (wc != null)
+                            if (wc.F_EditFlag == false) //没有修改过
                             {
-                                if (wc.F_EditFlag == false) //没有修改过
+                                if (wc.F_WorkingFlag)
                                 {
-                                    if (wc.F_WorkingFlag)
-                                    {
-                                        wc.F_WorkingFlag = false;
-                                    }
-                                    else
-                                    {
-                                        wc.F_WorkingFlag = true;
-                                    }
-                                    wc.F_EditFlag = true;
+                                    wc.F_WorkingFlag = false;
                                 }
-                                else//修改过 
+                                else
                                 {
-                                    if (wc.F_WorkingFlag)
-                                    {
-                                        wc.F_WorkingFlag = false;
-                                    }
-                                    else
-                                    {
-                                        wc.F_WorkingFlag = true;
-                                    }
-                                    wc.F_EditFlag = false;
+                                    wc.F_WorkingFlag = true;
                                 }
-                                bool rvalue = new BLL.T_Sys_WorkCalendar().Update(wc);
-                                if (rvalue)
+                                wc.F_EditFlag = true;
+                            }
+                            else//修改过 
+                            {
+                                if (wc.F_WorkingFlag)
                                 {
-                                    res = Success("设置成功！");
+                                    wc.F_WorkingFlag = false;
                                 }
                                 else
                                 {
-                                    res = Error("设置失败！");
+                                    wc.F_WorkingFlag = true;
                                 }
+                                wc.F_EditFlag = false;
+                            }
+                            bool rvalue = new BLL.T_Sys_WorkCalendar().Update(wc);
+                            if (rvalue)
+                            {
+                                res = Success("设置成功！");
                             }
                             else
                             {
-                                res = Error("获取对象失败");
+                                res = Error("设置失败！");
                             }
                         }
                         else
                         {
-                            res = Error("日期格式不正确");
+                            res = Error("获取对象失败");
                         }
                     }
                     else
                     {
-                        res = Error("获取参数失败");
+                        res = Error("日期格式不正确");
                     }
-            
+                }
+                else
+                {
+                    res = Error("获取参数失败");
+                }
+
             }
             return res;
         }
@@ -124,51 +126,55 @@ namespace CallCenterApi.Interface.Controllers.tel
             {
                 string sql = "";
                 DataTable dt = new DataTable();
-               
 
-                    string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
-                    if (keyword.Trim() != "" && keyword != "undefined")
-                    {
-                        sql += " and (convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim() + "%' or convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim()
-                            + "%' or F_TimeName like '%" + keyword.Trim() + "%'or F_Remark like '%" + keyword.Trim() + "%')";
-                    }
 
-                    string strpageindex = RequestString.GetQueryString("page");
-                    int pageindex = 1;
-                    string strpagesize = RequestString.GetQueryString("pagesize");
-                    int pagesize = 10;
+                string keyword = HttpUtility.UrlDecode(RequestString.GetQueryString("keyword"));
+                if (keyword.Trim() != "" && keyword != "undefined")
+                {
+                    sql += " and (convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim() + "%' or convert(varchar,F_WorkEndTimes,120) like '%" + keyword.Trim()
+                        + "%' or F_TimeName like '%" + keyword.Trim() + "%'or F_Remark like '%" + keyword.Trim() + "%')";
+                }
 
-                    if (strpageindex.Trim() != "")
-                    {
-                        pageindex = Convert.ToInt32(strpageindex);
-                    }
+                var deptId = CurrentUser.UserData.F_DeptId;
+                sql += $"  and   F_DeptId={deptId}   ";
 
-                    if (strpagesize.Trim() != "")
-                    {
-                        pagesize = Convert.ToInt32(strpagesize);
-                    }
-                    int recordCount = 0;
-                    dt = BLL.PagerBLL.GetListPager(
-                         "T_Sys_WorkTimes",
-                        "F_ID",
-                        "*",
-                        sql,
-                        "ORDER BY F_ID desc",
-                        pagesize,
-                        pageindex,
-                        true,
-                        out recordCount);
 
-                    var obj = new
-                    {
-                        state = "success",
-                        message = "成功",
-                        rows = dt,
-                        total = recordCount
-                    };
+                string strpageindex = RequestString.GetQueryString("page");
+                int pageindex = 1;
+                string strpagesize = RequestString.GetQueryString("pagesize");
+                int pagesize = 10;
+
+                if (strpageindex.Trim() != "")
+                {
+                    pageindex = Convert.ToInt32(strpageindex);
+                }
+
+                if (strpagesize.Trim() != "")
+                {
+                    pagesize = Convert.ToInt32(strpagesize);
+                }
+                int recordCount = 0;
+                dt = BLL.PagerBLL.GetListPager(
+                     "T_Sys_WorkTimes",
+                    "F_ID",
+                    "*",
+                    sql,
+                    "ORDER BY F_ID desc",
+                    pagesize,
+                    pageindex,
+                    true,
+                    out recordCount);
+
+                var obj = new
+                {
+                    state = "success",
+                    message = "成功",
+                    rows = dt,
+                    total = recordCount
+                };
+
+                res = Content(obj.ToJson());
 
-                    res = Content(obj.ToJson());
-            
             }
             return res;
         }
@@ -179,26 +185,26 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    if (id != null && id.Trim() != "")
+
+                if (id != null && id.Trim() != "")
+                {
+                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
+                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
+                    if (dModel != null)
                     {
-                        BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
-                        Model.T_Sys_WorkTimes dModel = dBLL.GetModel(int.Parse(id.Trim()));
-                        if (dModel != null)
-                        {
-                            res = Success("获取成功", dModel);
-                        }
-                        else
-                        {
-                            res = Error("获取失败");
-                        }
+                        res = Success("获取成功", dModel);
                     }
                     else
                     {
-                        res = Error("获取参数失败");
+                        res = Error("获取失败");
                     }
-                
-             
+                }
+                else
+                {
+                    res = Error("获取参数失败");
+                }
+
+
             }
             return res;
         }
@@ -209,97 +215,94 @@ 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)
+                        res = Error("操作失败");
+                        if (workid != null && workid != "")
                         {
-                            res=Error("操作失败");
-                            if (workid != null && workid != "")
+                            int id = 0;
+                            if (int.TryParse(workid, out id))
                             {
-                                int id = 0;
-                                if (int.TryParse(workid, out id))
+                                BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
+                                Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
+                                if (dModel != null)
                                 {
-                                    BLL.T_Sys_WorkTimes dBLL = new BLL.T_Sys_WorkTimes();
-                                    Model.T_Sys_WorkTimes dModel = dBLL.GetModel(id);
-                                    if (dModel != null)
+                                    if (!string.IsNullOrWhiteSpace(workstart.Trim()))
+                                    {
+                                        DateTime dt1 = new DateTime();
+                                        if (DateTime.TryParse(workstart.Trim(), out dt1))
+                                            dModel.F_WorkStartTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(workend.Trim()))
+                                    {
+                                        DateTime dt1 = new DateTime();
+                                        if (DateTime.TryParse(workend.Trim(), out dt1))
+                                            dModel.F_WorkEndTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(timename.Trim()))
+                                    {
+                                        dModel.F_TimeName = timename.Trim();
+                                    }
+                                    if (!string.IsNullOrWhiteSpace(remark.Trim()))
                                     {
-                                        if (!string.IsNullOrWhiteSpace(workstart.Trim()))   
-                                        {
-                                            DateTime dt1 = new DateTime();
-                                            if (DateTime.TryParse(workstart.Trim(), out dt1))
-                                                dModel.F_WorkStartTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
-                                        }
-                                        if (!string.IsNullOrWhiteSpace(workend.Trim()))
-                                        {
-                                            DateTime dt1 = new DateTime();
-                                            if (DateTime.TryParse(workend.Trim(), out dt1))
-                                                dModel.F_WorkEndTimes = Convert.ToDateTime(dt1.ToString("1900-01-01 HH:mm:ss"));
-                                        }
-                                        if (!string.IsNullOrWhiteSpace(timename.Trim()))
-                                        {
-                                            dModel.F_TimeName = timename.Trim();
-                                        }
-                                        if (!string.IsNullOrWhiteSpace(remark.Trim()))
-                                        {
-                                            dModel.F_Remark = remark.Trim();
-                                        }
+                                        dModel.F_Remark = remark.Trim();
+                                    }
 
-                                        bool b = dBLL.Update(dModel);
-                                        if (b)
-                                        {
-                                            res = Success("编辑成功");
-                                        }
-                                        else
-                                        {
-                                            res = Error("编辑失败");
-                                        }
+                                    bool b = dBLL.Update(dModel);
+                                    if (b)
+                                    {
+                                        res = Success("编辑成功");
+                                    }
+                                    else
+                                    {
+                                        res = Error("编辑失败");
                                     }
                                 }
                             }
-                            else
+                        }
+                        else
+                        {
+                            Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
+                            if (!string.IsNullOrWhiteSpace(workstart.Trim()))
                             {
-                                Model.T_Sys_WorkTimes _model = new Model.T_Sys_WorkTimes();
-                                if (!string.IsNullOrWhiteSpace(workstart.Trim()))
-                                {
-                                    DateTime dt2 = new DateTime();
-                                    if (DateTime.TryParse("1900-01-01 " + workstart.Trim(), out dt2))
-                                        _model.F_WorkStartTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
-                                }
-                                if (!string.IsNullOrWhiteSpace(workend.Trim()))
-                                {
-                                    DateTime dt2 = new DateTime();
-                                    if (DateTime.TryParse("1900-01-01 " + workend.Trim(), out dt2))
-                                        _model.F_WorkEndTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
-                                }
-                                if (!string.IsNullOrWhiteSpace(timename.Trim()))
-                                {
-                                    _model.F_TimeName = timename.Trim();
-                                }
-                                if (!string.IsNullOrWhiteSpace(remark.Trim()))
-                                {
-                                    _model.F_Remark = remark.Trim();
-                                }
-                                _model.F_CreateOn = DateTime.Now;
-                                _model.F_UserID = ua.F_UserId;
-                                _model.F_UserName = ua.F_UserName;
-                                _model.F_UserCode = ua.F_UserCode;
+                                DateTime dt2 = new DateTime();
+                                if (DateTime.TryParse("1900-01-01 " + workstart.Trim(), out dt2))
+                                    _model.F_WorkStartTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
+                            }
+                            if (!string.IsNullOrWhiteSpace(workend.Trim()))
+                            {
+                                DateTime dt2 = new DateTime();
+                                if (DateTime.TryParse("1900-01-01 " + workend.Trim(), out dt2))
+                                    _model.F_WorkEndTimes = Convert.ToDateTime(dt2.ToString("1900-01-01 HH:mm:ss"));
+                            }
+                            if (!string.IsNullOrWhiteSpace(timename.Trim()))
+                            {
+                                _model.F_TimeName = timename.Trim();
+                            }
+                            if (!string.IsNullOrWhiteSpace(remark.Trim()))
+                            {
+                                _model.F_Remark = remark.Trim();
+                            }
+                            _model.F_DeptId = CurrentUser.UserData.F_DeptId;
 
-                                int b = new BLL.T_Sys_WorkTimes().Add(_model);
-                                if (b > 0)
-                                {
-                                    res = Success("添加成功");
-                                }
-                                else
-                                {
-                                    res = Error("添加失败");
-                                }
+                            int b = new BLL.T_Sys_WorkTimes().Add(_model);
+                            if (b > 0)
+                            {
+                                res = Success("添加成功");
+                            }
+                            else
+                            {
+                                res = Error("添加失败");
                             }
                         }
                     }
-            
+                }
+
             }
             return res;
         }
@@ -310,28 +313,54 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-                
-                    if (ids != null && ids.Length > 0)
+
+                if (ids != null && ids.Length > 0)
+                {
+                    string idd = " ";
+                    foreach (string str in ids)
                     {
-                        string idd = " ";
-                        foreach (string str in ids)
-                        {
-                            idd += "'" + str + "',";
-                        }
-                        if (new BLL.T_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
-                        {
-                            res = Success("删除成功");
-                        }
-                        else
-                            res = Error("删除失败");
+                        idd += "'" + str + "',";
                     }
-                    else
+                    if (new BLL.T_Sys_WorkTimes().DeleteList(idd.TrimEnd(',')))
                     {
-                        res = Error("请选择要删除的记录");
+                        res = Success("删除成功");
                     }
-            
+                    else
+                        res = Error("删除失败");
+                }
+                else
+                {
+                    res = Error("请选择要删除的记录");
+                }
+
             }
             return res;
         }
+
+        [Authority]
+        public ActionResult GetIsOnDutyTime()
+        {
+            var deptId = CurrentUser.UserData.F_DeptId;
+            var list = workTimesBLL.DataTableToList(workTimesBLL.GetList($" F_DeptId={deptId} ").Tables[0]);
+            var isOnDutyTime = false;
+            var now = DateTime.Now.TimeOfDay;
+            foreach (var item in list)
+            {
+                var start = item.F_WorkStartTimes == null ? DateTime.MinValue : Convert.ToDateTime(item.F_WorkStartTimes);
+                var end = item.F_WorkEndTimes == null ? DateTime.MinValue : Convert.ToDateTime(item.F_WorkEndTimes);
+
+                var startTime = start.TimeOfDay;
+                var endTime = end.TimeOfDay;
+                if (now > startTime && now < endTime)
+                {
+                    isOnDutyTime = true;
+                    break;
+                }
+                continue;
+            }
+            if (isOnDutyTime)
+                return Success("");
+            return Error("未在正常上班时间，无法拨出电话");
+        }
     }
 }

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterCallPhone.cs

@@ -18,5 +18,6 @@ namespace CallCenterApi.Interface.Models.Filter
         public int HJJGID { get; set; } = -1;
         public int YHFKID { get; set; } = -1;
         public int RequestType { get; set; } = 1;
+        public bool IsExport { get; set; } = false;
     }
 }

CallCenterApi/CallCenterApi.Model/T_Sys_WorkTimes.cs

@@ -15,10 +15,7 @@ namespace CallCenterApi.Model
         private DateTime? _f_workendtimes;
         private string _f_timename;
         private string _f_remark;
-        private int? _f_userid;
-        private string _f_usercode;
-        private string _f_username;
-        private DateTime? _f_createon;
+        private int? _f_deptid;
         /// <summary>
         /// 
         /// </summary>
@@ -62,35 +59,12 @@ namespace CallCenterApi.Model
         /// <summary>
         /// 
         /// </summary>
-        public int? F_UserID
+        public int? F_DeptId
         {
-            set { _f_userid = value; }
-            get { return _f_userid; }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string F_UserCode
-        {
-            set { _f_usercode = value; }
-            get { return _f_usercode; }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public string F_UserName
-        {
-            set { _f_username = value; }
-            get { return _f_username; }
-        }
-        /// <summary>
-        /// 
-        /// </summary>
-        public DateTime? F_CreateOn
-        {
-            set { _f_createon = value; }
-            get { return _f_createon; }
+            set { _f_deptid = value; }
+            get { return _f_deptid; }
         }
+
         #endregion Model
 
     }

CallCenterCommon/CallCenter.Utility/NPOI/NPOIHelper.cs

@@ -8,6 +8,7 @@ using NPOI.HSSF.UserModel;
 using NPOI.SS.UserModel;
 using NPOI.SS.Util;
 using NPOI.XSSF.UserModel;
+using System.Collections.Generic;
 
 namespace CallCenter.Utility
 {
@@ -247,14 +248,14 @@ namespace CallCenter.Utility
             {
                 HSSFWorkbook workbook = new HSSFWorkbook();
                 //ISheet sheet = workbook.CreateSheet("Sheet1");
-                
+
                 //数据总数
                 int count = dt.Rows.Count;
                 //注意：1、Excel2003及以前版本65536行,256列;  2、Excel2007、2010版本1048576行,16384列
                 int sheetpage = 50000;   //这里设置5w条
                 //向上取整
                 int sheetindexcount = int.Parse(Math.Ceiling(Convert.ToDecimal((double)count / sheetpage)).ToString());
-                if(sheetindexcount == 0)
+                if (sheetindexcount == 0)
                     sheetindexcount = 1;
 
                 for (int n = 1; n <= sheetindexcount; n++)
@@ -388,11 +389,159 @@ namespace CallCenter.Utility
                 }
                 return "";
             }
-            catch(Exception ex)
+            catch (Exception ex)
+            {
+                return "导出失败！" + ex.Message;
+            }
+        }
+
+
+        /// <summary>
+        /// 弹出下载框导出excel => 创建多个Sheet：例如sheet1，sheet2...【数据源为 List<List<string>> 】
+        /// </summary>
+        /// <param name="Name"></param>
+        /// <param name="list"></param>
+        /// <returns></returns>
+        public string ExportToExcel(string Name, List<List<string>> list, string[] cols = null)
+        {
+            try
+            {
+                HSSFWorkbook workbook = new HSSFWorkbook();
+                //ISheet sheet = workbook.CreateSheet("Sheet1");
+
+                //数据总数
+                int count = list.Count;
+                //注意：1、Excel2003及以前版本65536行,256列;  2、Excel2007、2010版本1048576行,16384列
+                int sheetpage = 50000;   //这里设置5w条
+                //向上取整
+                int sheetindexcount = int.Parse(Math.Ceiling(Convert.ToDecimal((double)count / sheetpage)).ToString());
+                if (sheetindexcount == 0)
+                    sheetindexcount = 1;
+
+                for (int n = 1; n <= sheetindexcount; n++)
+                {
+                    ISheet sheet = workbook.CreateSheet("Sheet" + n);
+                    ICellStyle HeadercellStyle = workbook.CreateCellStyle();
+                    HeadercellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                    HeadercellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                    HeadercellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                    HeadercellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+                    HeadercellStyle.Alignment = HorizontalAlignment.Center;
+                    HeadercellStyle.FillForegroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
+                    HeadercellStyle.FillPattern = FillPattern.SolidForeground;
+                    HeadercellStyle.FillBackgroundColor = NPOI.HSSF.Util.HSSFColor.SkyBlue.Index;
+
+                    //字体
+                    NPOI.SS.UserModel.IFont headerfont = workbook.CreateFont();
+                    headerfont.Boldweight = (short)FontBoldWeight.Bold;
+                    headerfont.FontHeightInPoints = 12;
+                    HeadercellStyle.SetFont(headerfont);
+
+
+                    //用column name 作为列名
+                    int icolIndex = 0;
+                    IRow headerRow = sheet.CreateRow(0);
+                    foreach (string dc in cols)
+                    {
+                        ICell cell = headerRow.CreateCell(icolIndex);
+                        cell.SetCellValue(dc);
+                        cell.CellStyle = HeadercellStyle;
+                        icolIndex++;
+                    }
+
+                    ICellStyle cellStyle = workbook.CreateCellStyle();
+
+                    //为避免日期格式被Excel自动替换，所以设定 format 为 『@』 表示一率当成text來看
+                    cellStyle.DataFormat = HSSFDataFormat.GetBuiltinFormat("@");
+                    cellStyle.BorderBottom = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.BorderLeft = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.BorderRight = NPOI.SS.UserModel.BorderStyle.Thin;
+                    cellStyle.BorderTop = NPOI.SS.UserModel.BorderStyle.Thin;
+
+
+                    NPOI.SS.UserModel.IFont cellfont = workbook.CreateFont();
+                    cellfont.Boldweight = (short)FontBoldWeight.Normal;
+                    cellStyle.SetFont(cellfont);
+                    if (list.Count > 0)
+                    {
+                        //建立内容行
+                        int iRowIndex = 0;
+                        #region 修改不用
+                        //foreach (DataRow dr in dt.Rows)
+                        //{
+                        //    int iCellIndex = 0;
+                        //    IRow irow = sheet.CreateRow(iRowIndex + 1);
+                        //    for (int i = 0; i < dt.Columns.Count; i++)
+                        //    {
+                        //        string strsj = string.Empty;
+                        //        if (dr[i] != null)
+                        //        {
+                        //            strsj = dr[i].ToString();
+                        //        }
+                        //        ICell cell = irow.CreateCell(iCellIndex);
+                        //        cell.SetCellValue(strsj);
+                        //        cell.CellStyle = cellStyle;
+                        //        iCellIndex++;
+                        //    }
+                        //    iRowIndex++;
+                        //}
+                        #endregion
+
+                        int startcount = (n - 1) * sheetpage;
+                        int endcount = n * sheetpage;
+                        if (sheetindexcount == n)
+                            endcount = count;
+
+                        //for (int x = 0; x < dt.Rows.Count; x++)
+                        for (int x = startcount; x < endcount; x++)
+                        {
+                            int iCellIndex = 0;
+                            IRow irow = sheet.CreateRow(iRowIndex + 1);
+                            for (int i = 0; i < list[iRowIndex].Count; i++)
+                            {
+                                string strsj = string.Empty;
+
+                                strsj = list[iRowIndex][i];
+
+                                ICell cell = irow.CreateCell(iCellIndex);
+                                cell.SetCellValue(strsj);
+                                cell.CellStyle = cellStyle;
+                                iCellIndex++;
+                            }
+                            iRowIndex++;
+                        }
+
+                        //自适应列宽度
+                        for (int i = 0; i < icolIndex; i++)
+                        {
+                            sheet.AutoSizeColumn(i);
+                        }
+                    }
+                }
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    workbook.Write(ms);
+                    HttpContext curContext = HttpContext.Current;
+                    // 设置编码和附件格式
+                    curContext.Response.ContentType = "application/vnd.ms-excel";
+                    curContext.Response.ContentEncoding = Encoding.UTF8;
+                    curContext.Response.Charset = "";
+                    curContext.Response.AppendHeader("Content-Disposition",
+                        "attachment;filename=" + HttpUtility.UrlEncode(Name + ".xls", Encoding.UTF8));
+                    curContext.Response.BinaryWrite(ms.GetBuffer());
+                    workbook = null;
+                    ms.Close();
+                    ms.Dispose();
+                    curContext.Response.End();
+                }
+                return "";
+            }
+            catch (Exception ex)
             {
                 return "导出失败！" + ex.Message;
             }
         }
+
         /// <summary>
         /// 创建Sheet
         /// </summary>