外呼管理列表添加仅看自己创建的按钮

CallCenterApi/CallCenterApi.BLL/T_Call_CallRecords.cs

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

CallCenterApi/CallCenterApi.DAL/T_Call_CallRecords.cs

@@ -664,6 +664,29 @@ namespace CallCenterApi.DAL
             return model;
         }
 
+
+        /// <summary>
+        /// 得到一个对象实体
+        /// </summary>
+        public Model.T_Call_CallRecordsExpt DataRowToModelExpt(DataRow row)
+        {
+            Model.T_Call_CallRecordsExpt model = new Model.T_Call_CallRecordsExpt();
+            if (row != null)
+            {
+                model.callnumber = row["callnumber"] == DBNull.Value ? "" : row["callnumber"].ToString();
+                model.calltypes = row["calltypes"] == DBNull.Value ? "" : row["calltypes"].ToString();
+                model.callstates = row["callstates"] == DBNull.Value ? "" : row["callstates"].ToString();
+                model.usercode = row["usercode"] == DBNull.Value ? "" : row["usercode"].ToString();
+                model.username = row["username"] == DBNull.Value ? "" : row["username"].ToString();
+                model.begintime = row["begintime"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["begintime"]);
+                model.talkstarttime = row["talkstarttime"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["talkstarttime"]);
+                model.talkendtime = row["talkendtime"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["talkendtime"]);
+                model.endtime = row["endtime"] == DBNull.Value ? (DateTime?)null : Convert.ToDateTime(row["endtime"]);
+                model.talklongtime = row["talklongtime"] == DBNull.Value ? 0 : Convert.ToInt32(row["talklongtime"]);
+            }
+            return model;
+        }
+
         /// <summary>
         /// 获得数据列表
         /// </summary>

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerController.cs

@@ -111,7 +111,7 @@ namespace CallCenterApi.Interface.Controllers.customer
             if (customerIdArr.Length > 0)
             {
                 //根据主表数据ID获取自定义字段数据
-                customerExpandList = DbHelperSQL.Query($"select F_CustomerId, {string.Join(",", customerColumnArr)} from T_Cus_CustomerExpand where   F_CustomerId IN ({string.Join(",", customerIdArr)}) ").Tables[0];
+                customerExpandList = DbHelperSQL.Query($"select F_CustomerId { (customerColumnArr.Count > 0 ? "," + string.Join(",", customerColumnArr) : "")} from T_Cus_CustomerExpand where   F_CustomerId IN ({string.Join(", ", customerIdArr)}) ").Tables[0];
             }
             else
             {

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

@@ -96,17 +96,17 @@ namespace CallCenterApi.Interface.Controllers.report
             string strCallOutSql = "";
             if (stime != null && stime.Trim() != "")
             {
-                sqltimeCallRecords += $"  and datediff(d,'{stime.Trim()} 00:00:01',TimeAlerting)>=0  ";
-                strsqlcall += $"  and datediff(d,'{stime.Trim()} 00:00:01',BeginTime)>=0  ";
-                strCallOutSql += $"  and datediff(d,'{stime.Trim()} 00:00:01',TimeRingBack)>=0  ";
+                sqltimeCallRecords += $"  and TimeAlerting>='{stime.Trim()} 00:00:01' ";
+                strsqlcall += $"  and  BeginTime>='{stime.Trim()} 00:00:01' ";
+                strCallOutSql += $"  and TimeRingBack>='{stime.Trim()} 00:00:01'  ";
                 //sqltimeCallRecords += " and CONVERT(varchar , TimeAlerting, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
                 //strsqlcall += " and CONVERT(varchar , BeginTime, 120)>=CONVERT(varchar , '" + stime.Trim() + " 00:00:01', 120) ";
             }
             if (endtime != null && endtime.Trim() != "")
             {
-                sqltimeCallRecords += $"  and datediff(d,'{stime.Trim()} 23:59:59',TimeAlerting)>=0  ";
-                strsqlcall += $"  and datediff(d,'{stime.Trim()} 23:59:59',BeginTime)>=0  ";
-                strCallOutSql += $"  and datediff(d,'{endtime.Trim()} 23:59:59',TimeRingBack)>=0  ";
+                sqltimeCallRecords += $"  and  TimeAlerting>= '{stime.Trim()} 23:59:59'  ";
+                strsqlcall += $"  and  BeginTime>= '{stime.Trim()} 23:59:59'  ";
+                strCallOutSql += $"  and  TimeRingBack>='{endtime.Trim()} 23:59:59'   ";
                 //sqltimeCallRecords += " and CONVERT(varchar , TimeAlerting, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
                 //strsqlcall += " and CONVERT(varchar , BeginTime, 120)<=CONVERT(varchar , '" + endtime.Trim() + " 23:59:59', 120) ";
             }

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

@@ -284,23 +284,22 @@ namespace CallCenterApi.Interface.Controllers.tel
                 }
                 if (starttime.Trim() != "")
                 {
-                    sql += " and datediff(day,BeginTime,'" + starttime + "')<=0 ";
+                    sql += $" and  BeginTime>='{starttime}' ";
                 }
                 if (endtime.Trim() != "")
                 {
-                    sql += " and datediff(day,BeginTime,'" + endtime + "')>=0 ";
+                    sql += $" and  BeginTime<='{endtime}' ";
                 }
 
-                dt = callRecordBLL.GetListExpt(sql).Tables[0];
+                List<Model.T_Call_CallRecordsExpt> callRecordList = callRecordBLL.DataTableToListExpt(callRecordBLL.GetListExpt(sql).Tables[0]);
                 var users = new BLL.T_Sys_UserAccount().GetModelList("");
                 var deptList = deptBLL.DataTableToListForLevel(DbHelperSQL.Query("select F_DeptId,F_ParentId,F_DeptName,F_DeptCode,F_Layer,0 lvl FROM T_Sys_Department ").Tables[0]);
 
                 List<List<string>> resList = new List<List<string>>();
-                var a = dt.AsEnumerable().ToList();
-                foreach (DataRow row in a)
+                foreach (var item in callRecordList)
                 {
                     Model.T_Sys_UserAccount uu = null;
-                    uu = users.Where(u => u.F_UserCode.Equals(row["usercode"])).FirstOrDefault();
+                    uu = users.Where(u => u.F_UserCode.Equals(item.usercode)).FirstOrDefault();
                     Model.T_Sys_DepartmentLevel deptCategory = new Model.T_Sys_DepartmentLevel();
                     Model.T_Sys_DepartmentLevel channelCategory = new Model.T_Sys_DepartmentLevel();
                     if (uu != null)
@@ -312,34 +311,22 @@ namespace CallCenterApi.Interface.Controllers.tel
 
                     resList.Add(new List<string>()
                     {
-                        row["callnumber"].ToString(),
-                        row["calltypes"].ToString(),
-                        row["callstates"].ToString(),
-                        row["usercode"].ToString(),
-                        row["username"].ToString(),
+                        item.callnumber??"",
+                        item.calltypes??"",
+                        item.callstates??"",
+                        item.usercode??"",
+                        item.username??"",
                         deptCompany?.DeptName ?? "",
                         deptCategory?.DeptName ?? "",
                         channelCategory?.DeptName ?? "",
-                        row["begintime"].ToString(),
-                        row["talkstarttime"].ToString(),
-                        row["talkendtime"].ToString(),
-                        row["endtime"].ToString(),
-                        row["talklongtime"].ToString()
+                        item.begintime?.ToString("yyyy-MM-dd HH:mm:ss")??"",
+                        item.talkstarttime?.ToString("yyyy-MM-dd HH:mm:ss")??"",
+                        item.talkendtime?.ToString("yyyy-MM-dd HH:mm:ss")??"",
+                        item.endtime?.ToString("yyyy-MM-dd HH:mm:ss")??"",
+                        item.talklongtime.ToString(),
 
                     });
                 }
-
-
-                //int sid = dt.Rows.Count % 100 == 0 ? (dt.Rows.Count / 100) : (dt.Rows.Count / 100 + 1);
-                //for (int i = 1; i <= sid; i++)
-                //{
-                //    object aa = i.ToString() + "," + sid.ToString();
-                //    ThreadPool.QueueUserWorkItem(x =>
-                //    {
-
-                //    }, aa);
-                //}
-
                 NPOIHelper npoi = new NPOIHelper();
                 if (npoi.ExportToExcel($"通话记录_{DateTime.Now.ToString("yyyyMMddHHmmss")}", resList, col()) == "")
                 {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Filter/FilterCallPlan.cs

@@ -16,6 +16,7 @@ namespace CallCenterApi.Interface.Models.Filter
         /// 任务名称
         /// </summary>
         public string Name { get; set; }
+        public bool? MyOwn { get; set; } = false;
 
     }
 }

CallCenterApi/CallCenterApi.Model/CallCenterApi.Model.csproj

@@ -59,6 +59,7 @@
     <Compile Include="T_Call_BanCallOut.cs" />
     <Compile Include="T_Call_Blacklist.cs" />
     <Compile Include="T_Call_CallRecords.cs" />
+    <Compile Include="T_Call_CallRecordsExpt.cs" />
     <Compile Include="T_Call_CallRecordsLD.cs" />
     <Compile Include="T_Call_CallRecords_QC.cs" />
     <Compile Include="T_Call_LeaveRecord.cs" />

CallCenterApi/CallCenterApi.Model/T_Call_CallRecordsExpt.cs

@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace CallCenterApi.Model
+{
+    public class T_Call_CallRecordsExpt
+    {
+        public string callnumber { get; set; }
+        public string calltypes { get; set; }
+        public string callstates { get; set; }
+        public string usercode { get; set; }
+        public string username { get; set; }
+        public DateTime? begintime { get; set; }
+        public DateTime? talkstarttime { get; set; }
+        public DateTime? talkendtime { get; set; }
+        public DateTime? endtime { get; set; }
+        public int talklongtime { get; set; }
+
+    }
+}