1、长呼入次数 与 坐席工作报表 呼入电话数 数值不统一 修改（原因是一个是根据工号查询，一个是工号姓名【由于可能工号不变，会修改姓名】）；2、来电单位关键字 下拉卡死优化（获取前200条）

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Configs/system.config

@@ -23,4 +23,7 @@
   <add key="WechatAppid" value="wx957c2297c315e6a5" />
   <!-- 设置微信appsecret -->
   <add key="WechatAppsecret" value="6c2d1f9fd32f906c315f03398800d474" />
+  <!-- ================== 4：来电单位关键字参数 ================== -->
+  <!-- 来点单位 查询每个表top记录数（工单表，客户档案表），包括重复关键字 -->
+  <add key="CallUnitNum" value="200" />
 </appSettings>

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

@@ -20,6 +20,10 @@ namespace CallCenterApi.Interface.Controllers.customer
     //[Authority]
     public class CustomerController : BaseController
     {
+        BLL.T_Wo_WorkOrder bllWo = new BLL.T_Wo_WorkOrder();
+        BLL.T_Cus_CustomerBase bllCus = new BLL.T_Cus_CustomerBase();
+
+        public int CallUnitNum = Convert.ToInt32(Configs.GetValue("CallUnitNum"));
         /// <summary>
         /// 获取客户列表
         /// </summary>
@@ -262,9 +266,14 @@ namespace CallCenterApi.Interface.Controllers.customer
                             }
                         }
                     }
-                    List<string> lddep = new BLL.T_Cus_CustomerBase().GetLDdep();
-                    var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
-                    var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+                    //List<string> lddep = new BLL.T_Cus_CustomerBase().GetLDdep();
+                    //var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                    //var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+
+                    var lddep = GetLDdep();//从客户信息查找
+                    var listWo = bllWo.GetList(CallUnitNum, "1=1", " CreateTime DESC ");
+                    var gdlddep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                    var gdfkdep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
                     foreach (var item in gdlddep)
                     {
                         if (!lddep.Contains(item))
@@ -275,6 +284,7 @@ namespace CallCenterApi.Interface.Controllers.customer
                         if (!lddep.Contains(item))
                             lddep.Add(item);
                     }
+                    List<string> lddepResult = lddep.Distinct().ToList();
                     CacheHelper.Insert("LDDep", lddep);
                 }
                 return Error("参数错误");
@@ -309,9 +319,14 @@ namespace CallCenterApi.Interface.Controllers.customer
                         if (DbHelperSQL.ExecuteSql(sql) > 0)
                         {
                             res = Success("设置成功");
-                            List<string> lddep = new BLL.T_Cus_CustomerBase().GetLDdep();
-                            var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
-                            var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+                            //List<string> lddep = new BLL.T_Cus_CustomerBase().GetLDdep();
+                            //var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                            //var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+
+                            var lddep = GetLDdep();//从客户信息查找
+                            var listWo = bllWo.GetList(CallUnitNum, "1=1", " CreateTime DESC ");
+                            var gdlddep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                            var gdfkdep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
                             foreach (var item in gdlddep)
                             {
                                 if (!lddep.Contains(item))
@@ -322,6 +337,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                                 if (!lddep.Contains(item))
                                     lddep.Add(item);
                             }
+
+                            List<string> lddepResult = lddep.Distinct().ToList();
                             CacheHelper.Insert("LDDep", lddep);
                         }
                         else
@@ -377,9 +394,15 @@ namespace CallCenterApi.Interface.Controllers.customer
                 }
                 else
                 {
-                    lddep = new BLL.T_Cus_CustomerBase().GetLDdep();//从客户信息查找
-                    var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
-                    var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+                    //lddep = new BLL.T_Cus_CustomerBase().GetLDdep();//从客户信息查找
+                    //var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                    //var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+
+                    lddep = GetLDdep();//从客户信息查找
+                    var listWo = bllWo.GetList(CallUnitNum, "1=1", " CreateTime DESC ");                     
+                    var gdlddep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                    var gdfkdep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+
                     foreach (var item in gdlddep)
                     {
                         if (!lddep.Contains(item))
@@ -406,6 +429,9 @@ namespace CallCenterApi.Interface.Controllers.customer
 
                             //}
                         }
+                        //lddep = lddep.OrderBy(x=>x.cre);
+                        List<string> lddepResult = lddep.Distinct().ToList();
+                        CacheHelper.Insert("LDDep", lddepResult);
                         var obj = new
                         {
                             dep = resdep
@@ -418,6 +444,41 @@ namespace CallCenterApi.Interface.Controllers.customer
             }
             return res;
         }
+
+        /// <summary>
+        /// 获取来电单位
+        /// </summary>
+        /// <returns></returns>
+        public List<string> GetLDdep()
+        {
+            List<string> resdep = new List<string>();
+            List<string> lddep = new List<string>();
+            var listCus = bllCus.GetList(CallUnitNum, "1=1", " F_CreatedOn DESC ");
+            var gdlddep = bllCus.DataTableToList(listCus.Tables[0]).Select(p => p.F_CustomerIndustry).Distinct().ToList();//从工单来电单位中加载
+            var gdfkdep = bllCus.DataTableToList(listCus.Tables[0]).Select(p => p.F_RelationShipClass).Distinct().ToList();//从工单反馈单位中加载
+            foreach (var item in gdlddep)
+            {
+                if (!lddep.Contains(item))
+                    lddep.Add(item);
+            }
+            foreach (var item in gdfkdep)
+            {
+                if (!lddep.Contains(item))
+                    lddep.Add(item);
+            }
+            if (lddep != null && lddep.Count > 0)
+            {
+                foreach (string dep in lddep)
+                {
+                    if (!Utils.IsNumeric(dep))
+                    {
+                        resdep.Add(dep);
+                    }
+                }
+            }
+            return resdep;
+        }
+
         /// <summary>
         /// 判断来电单位是否存在。不存在才可以
         /// </summary>

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

@@ -316,7 +316,9 @@ namespace CallCenterApi.Interface.Controllers.report
             //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];
             //var recordstr = " select users.F_UserId,users.F_UserCode,users.F_UserName,COUNT(*) AS calloutCount from T_Sys_UserAccount users right join T_Call_CallRecords records on users.F_UserCode = records.UserCode and 1=1 " + sql + " GROUP BY users.F_UserId,users.F_UserCode,users.F_UserName";
             //20180509 通话时长统计不对  machenyang
-            var recordstr = " select records.UserCode,records.UserId,records.UserName,COUNT(*) from T_Call_CallRecords records where 1=1 " + sql + "  and UserCode is not null group by records.UserCode,records.UserId,records.UserName";
+            //20180509 通话时长呼入次数 与 坐席工作报表 呼入电话数 数值不统一 修改（原因是一个是根据工号查询，一个是工号姓名【由于可能工号不变，会修改姓名】）  lihai
+            //var recordstr = " select records.UserCode,records.UserId,records.UserName,COUNT(*) from T_Call_CallRecords records where 1=1 " + sql + "  and UserCode is not null group by records.UserCode,records.UserId,records.UserName";
+            var recordstr = " select records.UserCode,COUNT(*) from T_Call_CallRecords records where 1=1 " + sql + "  and UserCode is not null group by records.UserCode";
             DataTable dt = DbHelperSQL.Query(recordstr).Tables[0];
             Dictionary<string, int> myDictionary = new Dictionary<string, int>();
 
@@ -329,7 +331,8 @@ namespace CallCenterApi.Interface.Controllers.report
 
                 if (drUser != null)
                 {
-                    myDictionary[item.F_UserCode] += int.Parse(drUser[3].ToString());
+                    myDictionary[item.F_UserCode] += int.Parse(drUser[1].ToString());
+                    //myDictionary[item.F_UserCode] += int.Parse(drUser[3].ToString());
                 }
             }
 

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

@@ -2,6 +2,7 @@
 using CallCenterApi.Common;
 using CallCenterApi.DB;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Controllers.customer;
 using System;
 using System.Collections.Generic;
 using System.Data;
@@ -14,6 +15,8 @@ namespace CallCenterApi.Interface.Controllers.tel
 {
     public class CallInScreenController : BaseController
     {
+        BLL.T_Wo_WorkOrder bllWo = new BLL.T_Wo_WorkOrder();
+        BLL.T_Cus_CustomerBase bllCus = new BLL.T_Cus_CustomerBase();
         /// <summary>
         /// 添加黑名单
         /// </summary>
@@ -803,13 +806,21 @@ namespace CallCenterApi.Interface.Controllers.tel
                                     lddep_cache.Add(lddep);
                                 if (!lddep_cache.Contains(fkdep))
                                     lddep_cache.Add(fkdep);
+                                List<string> lddepResult = lddep_cache.Distinct().ToList();
                                 CacheHelper.Insert("LDDep", lddep_cache);
                             }
                             else
                             {
-                                lddep_cache = new BLL.T_Cus_CustomerBase().GetLDdep();
-                                var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
-                                var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+                                //lddep_cache = new BLL.T_Cus_CustomerBase().GetLDdep();
+                                //var gdlddep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                                //var gdfkdep = new BLL.T_Wo_WorkOrder().GetModelList("1=1").Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
+
+                                CustomerController cusController = new CustomerController();
+
+                                lddep_cache = cusController.GetLDdep();//从客户信息查找
+                                var listWo = bllWo.GetList(cusController.CallUnitNum, "1=1", " CreateTime DESC ");
+                                var gdlddep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Address).Distinct().ToList();//从工单来电单位中加载
+                                var gdfkdep = bllWo.DataTableToList(listWo.Tables[0]).Select(p => p.Source).Distinct().ToList();//从工单反馈单位中加载
                                 foreach (var item in gdlddep)
                                 {
                                     if (!lddep.Contains(item))
@@ -826,6 +837,7 @@ namespace CallCenterApi.Interface.Controllers.tel
                                         lddep_cache.Add(lddep);
                                     if (!lddep_cache.Contains(fkdep))
                                         lddep_cache.Add(fkdep);
+                                    List<string> lddepResult = lddep_cache.Distinct().ToList();
                                     CacheHelper.Insert("LDDep", lddep_cache);
                                 }
                                 else

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Web.config

@@ -17,7 +17,7 @@
     <add key="smssign" value="中鑫之宝"/>
   </appSettings>
   <connectionStrings>
-    <add name="ConnectionString" connectionString="Data Source=192.168.5.8;User ID=sa;pwd=hykj800100;Initial Catalog=CallCenter_Anto_20180820;"/>
+    <add name="ConnectionString" connectionString="Data Source=192.168.5.8;User ID=sa;pwd=hykj800100;Initial Catalog=CallCenter_Auto_20180905;"/>
 	  <!--<add name="ConnectionString" connectionString="Data Source=192.168.4.18;User ID=sa;pwd=800100;Initial Catalog=CallCenter_Anto;"/>-->
     
   </connectionStrings>