mac地址绑定，优化通话记录性能

.gitignore

@@ -122,3 +122,4 @@ data/客服php/Db_zzmetro_dtkf_20201102_013001.sql.gz
 web/YTSoft.BaseCallCenter.MVCWeb/App_Data/
 web/YTSoft.BaseCallCenter.MVCWeb/log/
 web/YTSoft.BaseCallCenter.MVCWeb.rar
+data/数据迁移准备sql/二期.rar

data/数据迁移准备sql/二期/数据准备.txt

@@ -1,5 +1,7 @@
 字典数据准备    常用人员    线路  一键转接
 
+触发器trans
+
 
 人员数据准备   备份原数据库    删除人员表   更新人员最新数据  T_Sys_UserAccount
 部门数据准备   备份原数据库    删除部门表   更新最新部门数据  T_Sys_Department   

web/BaseCallCenter.DAL/Order/T_Wo_WorkOrderBase.cs

@@ -1553,8 +1553,26 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
                 model.F_OVERTIMES = 0;
 
             }
-
-
+            string F_HOUSINGint = "0";
+            switch (model.F_HOUSING)
+            {
+                case "咨询":
+                    F_HOUSINGint = "1";
+                    break;
+                case "投诉":
+                    F_HOUSINGint = "2";
+                    break;
+                case "建议":
+                    F_HOUSINGint = "3";
+                    break;
+                case "表扬":
+                    F_HOUSINGint = "4";
+                    break;
+                case "挂失":
+                    F_HOUSINGint = "5";
+                    break;
+            }
+            DbHelperSQL.ExecuteSql(string.Format("update T_Call_CallRecords set F_ServiceType={0}  where CallId=(select top 1 F_KSHADDRESSCODE from  T_Wo_WorkOrderBase where F_WORKORDERID={1})", F_HOUSINGint, model.F_WORKORDERID));
 
             StringBuilder strSql = new StringBuilder();
 
@@ -2275,7 +2293,7 @@ F_SERVICETYPE,F_DECLARATIONTIME,F_SERVICENATURE,F_SERVICEWAY,F_RETURNVISITMAN,F_
             {
                 StringBuilder strSql = new StringBuilder();
                 strSql.Append(" update T_Wo_WorkOrderBase set ");
-                strSql.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='未处理'  where F_WORKORDERID=" + workOrderId);
+                strSql.Append(" F_WORKORDERSTATEID=0,F_REPAIRREQUEST='未处理',F_HASTENCOUNTS=0  where F_WORKORDERID=" + workOrderId);
 
                 int hisid = EditOrderHistoryInfo(workOrderId, byid, byname, bmid, bmmc);
                 if (hisid > 0)

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/DefaultController.cs

@@ -4,6 +4,7 @@ using System.Configuration;
 using System.Data;
 using System.Linq;
 using System.Net.NetworkInformation;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Web;
 using System.Web.Mvc;
@@ -78,7 +79,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                             {
                                 extensionphone = tempExtensionphone.ToMyString();
                             }
-
+                            LogHelper.Default.WriteInfo("tsKey:" + extensionphone);
                             Dictionary<string, string> Dic = new Dictionary<string, string>();
                             Dic.Add("F_UserID", dt.Rows[0]["F_UserId"].ToString());
                             Dic.Add("F_UserCode", dt.Rows[0]["F_UserCode"].ToString());
@@ -371,22 +372,70 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         public static int GetNetworkAdpaterID()
         {
             int ret = 0;
-            NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
-            if (nics != null && nics.Length > 0)
+            //NetworkInterface[] nics = NetworkInterface.GetAllNetworkInterfaces();
+            //if (nics != null && nics.Length > 0)
+            //{
+            //    foreach (NetworkInterface nic in nics)
+            //    {   string mac = nic.GetPhysicalAddress().ToString();
+            //        LogHelper.Default.WriteInfo("MAC:" + mac);
+            //        if (string.IsNullOrEmpty(mac))
+            //            continue;
+            //        ret = new BLL.T_Mac().GetNum(mac);
+            //        if (ret > 0)
+            //        {
+            //            LogHelper.Default.WriteInfo("MAC1:" + mac);
+            //            break;
+            //        }
+            //    }
+            //}
+            string mac = GetClientMAC();
+            ret = new BLL.T_Mac().GetNum(mac);
+            return ret;
+        }
+        [DllImport("Iphlpapi.dll")]
+        private static extern int SendARP(Int32 dest, Int32 host, ref Int64 mac, ref Int32 length);
+        [DllImport("Ws2_32.dll")]
+        private static extern Int32 inet_addr(string ip);
+
+        private static string GetClientMAC()
+        {
+            string mac_dest = string.Empty;
+            // 在此处放置用户代码以初始化页面
+            try
             {
-                foreach (NetworkInterface nic in nics)
-                {   string mac = nic.GetPhysicalAddress().ToString();
-                    if (string.IsNullOrEmpty(mac))
-                        continue;
-                    ret = new BLL.T_Mac().GetNum(mac);
-                    if (ret > 0)
+                string userip = System.Web.HttpContext.Current.Request.UserHostAddress;
+                string strClientIP = System.Web.HttpContext.Current.Request.UserHostAddress.ToString().Trim();
+                Int32 ldest = inet_addr(strClientIP); //目的地的ip 
+                Int32 lhost = inet_addr("");   //本地服务器的ip 
+                Int64 macinfo = new Int64();
+                Int32 len = 6;
+                int res = SendARP(ldest, 0, ref macinfo, ref len);
+                string mac_src = macinfo.ToString("X");
+                while (mac_src.Length < 12)
+                {
+                    mac_src = mac_src.Insert(0, "0");
+                }
+                for (int i = 0; i < 11; i++)
+                {
+                    if (0 == (i % 2))
                     {
-                       // LogHelper.Default.WriteInfo("MAC:" + mac);
-                        break;
+                        if (i == 10)
+                        {
+                            mac_dest = mac_dest.Insert(0, mac_src.Substring(i, 2));
+                        }
+                        else
+                        {
+                            mac_dest = "-" + mac_dest.Insert(0, mac_src.Substring(i, 2));
+                        }
+
                     }
                 }
             }
-            return ret;
+            catch (Exception ex)
+            {
+                throw ex;
+            }
+            return mac_dest;
         }
 
     }

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/HW/CallRecordController.cs

@@ -1056,21 +1056,33 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             //工单类型 F_HOUSING select F_WORKORDERTYPEID,F_CONTENT,F_HOUSING from  T_Wo_WorkOrderBase where 1=1  and  F_CONTENT like '%'++'%'
 
             
-            if (F_WORKORDERTYPEID>0)
-            {
-                sql += "  AND  F_WorkOrderTypeId IS NOT null  and F_WORKORDERTYPEID=" + F_WORKORDERTYPEID;
-            }  //工单内容 F_CONTENT
-            if (!string.IsNullOrEmpty(F_CONTENT))
-            {
-                sql += string.Format(" AND  F_WorkOrderTypeId IS NOT null and T2.F_CONTENT like '%{0}%'", F_CONTENT);
-            }
+
             //工单类型
             if (!string.IsNullOrEmpty(F_HOUSING))
             {
-                sql += string.Format("  AND  F_WorkOrderTypeId IS NOT null and T2.F_HOUSING='{0}'", F_HOUSING);
+                //sql += string.Format("  AND  F_WorkOrderTypeId IS NOT null and T2.F_HOUSING='{0}'", F_HOUSING);
+                string F_HOUSINGint = "0";
+                switch (F_HOUSING)
+                {
+                    case "咨询":
+                        F_HOUSINGint = "1";
+                        break;
+                    case "投诉":
+                        F_HOUSINGint = "2";
+                        break;
+                    case "建议":
+                        F_HOUSINGint = "3";
+                        break;
+                    case "表扬":
+                        F_HOUSINGint = "4";
+                        break;
+                    case "挂失":
+                        F_HOUSINGint = "5";
+                        break;
+                }
+                sql += string.Format("AND F_ServiceType={0} ", F_HOUSINGint);
             }
 
-          
 
             //呼叫状态,0:未接通电话1已接通电话
             if (!string.IsNullOrEmpty(callStatus))
@@ -1083,11 +1095,45 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             //BLL.T_Call_CallRecords busCall_CallRecords = new BLL.T_Call_CallRecords();
             //busCall_CallRecords.GetListByPage();
             Model.PageData<Model.T_Call_CallRecords_All> pageModel = new Model.PageData<Model.T_Call_CallRecords_All>();
-            dt = BLL.PagerBLL.GetTableList(
-                " (T_Call_CallRecords T1 LEFT JOIN T_Wo_WorkOrderBase T2 ON T1.CallId=T2.F_KSHADDRESSCODE ) ",
-                "CallRecordsId",
-                "T1.*,F_WORKORDERID,F_HOUSING,CONVERT(varchar,BeginTime, 120 ) as BeginTimeNew,CONVERT(varchar,TalkStartTime, 120 ) as TalkStartTimeNew,CONVERT(varchar,TalkEndTime, 120 ) as TalkEndTimeNew"
-                + @",(select top 1 F_ScaleResume from T_Cus_CustomerBase n where
+//            dt = BLL.PagerBLL.GetTableList(
+//                " (T_Call_CallRecords T1 LEFT JOIN T_Wo_WorkOrderBase T2 ON T1.CallId=T2.F_KSHADDRESSCODE ) ",
+//                "CallRecordsId",
+//                "T1.*,F_WORKORDERID,F_HOUSING,CONVERT(varchar,BeginTime, 120 ) as BeginTimeNew,CONVERT(varchar,TalkStartTime, 120 ) as TalkStartTimeNew,CONVERT(varchar,TalkEndTime, 120 ) as TalkEndTimeNew"
+//                + @",(select top 1 F_ScaleResume from T_Cus_CustomerBase n where
+//CallNumber=F_Telephone) as F_ScaleResume,
+//replace(replace(FilePath,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "')" +
+//@" as fileurl,case
+// when  BusinessType=1 then '咨询'
+// when  BusinessType=2 then '建议'
+// when  BusinessType=3 then '表扬'
+// when  BusinessType=4 then '挂失'
+// when  BusinessType=9 then '投诉'
+
+// when  T1.F_ServiceType=1 then '咨询'
+// when  T1.F_ServiceType = 2 then '投诉'
+// when  T1.F_ServiceType = 3 then '建议'
+// when  T1.F_ServiceType = 4 then '表扬'
+// when  T1.F_ServiceType = 5 then '挂失'
+// else '' end as
+//BType, case when (isnull(BusinessType,0)>0 or isnull(T1.F_ServiceType,0)>0) then '人工服务' else '' end  as ywtype  ", 
+//                sql,
+//                // "ORDER BY LongTime,CallRecordsId desc",
+//                string.IsNullOrEmpty(sort) ? " BeginTime desc":  sort + " desc"
+//                ,
+               
+//                limit,
+//                page,
+//                out recordCount);
+
+
+
+            dt = BLL.PagerBLL.GetListPager(
+    " T_Call_CallRecords ",
+    "CallRecordsId",
+    "*," +
+    "(select top 1 F_WORKORDERID from T_Wo_WorkOrderBase where F_KSHADDRESSCODE=CallId) as F_WORKORDERID," +
+    "CONVERT(varchar,BeginTime, 120 ) as BeginTimeNew,CONVERT(varchar,TalkStartTime, 120 ) as TalkStartTimeNew,CONVERT(varchar,TalkEndTime, 120 ) as TalkEndTimeNew"
+    + @",(select top 1 F_ScaleResume from T_Cus_CustomerBase n where
 CallNumber=F_Telephone) as F_ScaleResume,
 replace(replace(FilePath,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "')" +
 @" as fileurl,case
@@ -1097,21 +1143,21 @@ replace(replace(FilePath,'\','/'),'" + GetSysconfig("newFilePath") + "','" + Get
  when  BusinessType=4 then '挂失'
  when  BusinessType=9 then '投诉'
 
- when  T1.F_ServiceType=1 then '咨询'
- when  T1.F_ServiceType = 2 then '投诉'
- when  T1.F_ServiceType = 3 then '建议'
- when  T1.F_ServiceType = 4 then '表扬'
- when  T1.F_ServiceType = 5 then '挂失'
+ when  F_ServiceType=1 then '咨询'
+ when  F_ServiceType = 2 then '投诉'
+ when  F_ServiceType = 3 then '建议'
+ when  F_ServiceType = 4 then '表扬'
+ when  F_ServiceType = 5 then '挂失'
  else '' end as
-BType, case when (isnull(BusinessType,0)>0 or isnull(T1.F_ServiceType,0)>0) then '人工服务' else '' end  as ywtype  ", 
-                sql,
-                // "ORDER BY LongTime,CallRecordsId desc",
-                string.IsNullOrEmpty(sort) ? " BeginTime desc":  sort + " desc"
-                ,
-               
-                limit,
-                page,
-                out recordCount);
+ BType, case when (isnull(BusinessType,0)>0 or isnull(F_ServiceType,0)>0) then '人工服务' else '' end  as ywtype  ",
+    sql,
+    // "ORDER BY LongTime,CallRecordsId desc",
+    string.IsNullOrEmpty(sort) ? "ORDER BY BeginTime desc" : "ORDER BY "+ sort + " desc"
+    ,
+    limit,
+    page,
+    true,
+    out recordCount);
 
 
             dataModel.code = 0;

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/KF/QuickMsgsController.cs

@@ -59,9 +59,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         #endregion
 
         [ActionName("GetListData")]
-        public string GetListData(string key = "", int type = -1, int page = 0, int limit = 20)
+        public string GetListData(DateTime? NowDateTime,string key = "", int type = -1, int page = 0, int limit = 20)
         {
-            string strWhere = " 1=1 ";
+            string strWhere = string.Format("  service_id in (0,{0})", F_PId.ToInt32());
             if (!string.IsNullOrEmpty(key))
             {
                 strWhere += string.Format(" and msg like '%{0}%'", key);
@@ -71,7 +71,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 strWhere += string.Format(" and service_id {0}", type == 1 ? "!=0" : "=0");
             }
 
-            DataTable dt = busQuickMsgs.GetListByPage(strWhere, "", (page - 1) * limit, limit).Tables[0];
+
+            DataTable dt = busQuickMsgs.GetListByPage(strWhere, " service_id asc, rate desc ", (page - 1) * limit, limit).Tables[0];
             int count = busQuickMsgs.GetRecordCount(strWhere);
             return Success("成功", dt, count);
         }
@@ -87,7 +88,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         }
 
         [ActionName("adddata")]
-        public string AddData(string msg = "", int type = 0)
+        public string AddData(string msg = "", int type = 0,int rate=0)
         {
           
             if (string.IsNullOrEmpty(msg))
@@ -99,7 +100,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 return Error("请输入值type");
             }
 
-            string strWhere = string.Format("  msg='{0}' and service_id{1} ", msg, type==1 ?"!=0":"=0");
+            string strWhere = string.Format("  msg='{0}' and service_id{1} ", msg, type==1 ?"="+F_PId.ToInt32():"=0");
             int count = busQuickMsgs.GetRecordCount(strWhere);
             if (count > 0)
             {
@@ -107,9 +108,9 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             }
 
             Model.kf_quick_msgs model = new kf_quick_msgs();            
-            model.service_id = type;            
+            model.service_id = type==0?0:F_PId.ToInt32();            
             model.msg = msg;
-            model.rate = 0;
+            model.rate = rate;
 
             if (busQuickMsgs.Add(model))
             {
@@ -121,7 +122,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         }
 
         [ActionName("editdata")]
-        public string EditData(string msg = "",int id=0)
+        public string EditData(string msg = "",int id=0,int rate=-1)
         {
 
             if (string.IsNullOrEmpty(msg))
@@ -135,7 +136,10 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             string modeljson = JsonConvert.SerializeObject(model);
             
             model.msg = msg;
-
+            if (rate >= 0)
+            {
+                model.rate = rate;
+            }
             if (busQuickMsgs.Update(model))
             {
                 AddLog("kf_quick_msgs", model.id.ToString(), "修改消息", modeljson, model);

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/OCXOptController.cs

@@ -4,6 +4,7 @@ using System.Linq;
 using System.Web;
 using System.Web.Mvc;
 using System.Data;
+using YTSoft.Common;
 
 namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 {
@@ -28,7 +29,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
         {
             //&timeno=" + timeno+"&callid=" + callID + "&userid=" + userid + "&usercode=" + usercode 
             //+ "&username=" + username + "&extnumber" + extnumber + "&callernum=" + callerNum
-            AddAction("T_Call_CallRecords", callid, "通话处理",string.Format("事件：{0},callid={1},usercode={2},extnumber={3},callernum={4}", optaction, callid, usercode, extnumber, callernum),"关键信息");
+            AddAction("T_Call_CallRecords", callid, "通话处理",string.Format("事件：{0},callid={1},userid={5},usercode={2},extnumber={3},callernum={4}", optaction, callid, usercode, extnumber, callernum, userid),"关键信息");
 
             string res = "error";
             try
@@ -508,6 +509,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 if (vmodel != null)
                 {
                     #region 存在通话记录
+                    AddAction("T_Call_CallRecords", callid, "步骤2", string.Format("存在通话记录 事件：{0},callid={1},usercode={2},extnumber={3},callernum={4}", "zhenlingEvent", callid, usercode, extnumber, callernum), "关键信息");
+
                     Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
                     model.CallId = callid;
                     if (!string.IsNullOrEmpty(userid))
@@ -530,8 +533,11 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     }
                     model.DealType = 5;
                     bool bl = new BLL.T_Call_CallRecords().UpdateCallInRingTelRecord(model);
+
                     if (bl)
                     {
+                        AddAction("T_Call_CallRecords", callid, "步骤3", string.Format("更新成功 事件：{0},callid={1},usercode={2},extnumber={3},callernum={4},userid={5}", "zhenlingEvent", callid, usercode, extnumber, callernum, userid), "关键信息");
+
                         string phone = callernum;
                         #region 来电归属地查询
                         string location = "";
@@ -562,13 +568,20 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                             catch { }
                             res = workorderid.ToString();
                         }
-                        
+
                         #endregion
                     }
+                    else
+                    {
+                        AddAction("T_Call_CallRecords", callid, "步骤3", string.Format("更新失败 事件：{0},callid={1},usercode={2},extnumber={3},callernum={4},userid={5}", "zhenlingEvent", callid, usercode, extnumber, callernum, userid), "关键信息");
+
+                    }
                     #endregion
                 }
                 else
                 {
+                    AddAction("T_Call_CallRecords", callid, "步骤2", string.Format("不存在通话记录 事件：{0},callid={1},usercode={2},extnumber={3},callernum={4},userid={5}", "zhenlingEvent", callid, usercode, extnumber, callernum, userid), "关键信息");
+
                     Model.T_Call_CallRecords model = new Model.T_Call_CallRecords();
                     model.CallId = callid;
                     model.CallNumber = callernum.Trim();
@@ -600,6 +613,8 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                     int b = new BLL.T_Call_CallRecords().Add(model);
                     if (b > 0)
                     {
+                        AddAction("T_Call_CallRecords", callid, "步骤3", string.Format("添加成功 事件：{0},callid={1},usercode={2},extnumber={3},callernum={4},userid={5}", "zhenlingEvent", callid, usercode, extnumber, callernum, userid), "关键信息");
+
                         string phone = callernum;
                         #region 来电归属地查询
                         string location = "";
@@ -633,11 +648,16 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
 
                         #endregion
                     }
+                    else
+                    {
+                        AddAction("T_Call_CallRecords", callid, "步骤3", string.Format("添加失败 事件：{0},callid={1},usercode={2},extnumber={3},callernum={4},userid={5}", "zhenlingEvent", callid, usercode, extnumber, callernum, userid), "关键信息");
+
+                    }
                 }
             }
             catch (Exception ex)
             {
-                //res = ex.ToString();
+                LogHelper.Default.WriteError("振铃事件:", ex);
             }
             return res;
         }

web/YTSoft.BaseCallCenter.MVCWeb/Controllers/Order/OrderController.cs

@@ -349,7 +349,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 "T_Wo_WorkOrderBase",
                 "F_WORKORDERID",
               "*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew"
-              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
+              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT top 1 F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT top 1 FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
                 //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
                 sql,
                 "ORDER BY F_CREATEDATE desc",
@@ -706,7 +706,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 "T_Wo_WorkOrderBase",
                 "F_WORKORDERID",
               "*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew"
-              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
+              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT top 1 F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT top 1 FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
                 //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
                 sql,
                 "ORDER BY F_CREATEDATE desc",
@@ -937,7 +937,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 "T_Wo_WorkOrderBase",
                 "F_WORKORDERID",
               "*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew"
-              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
+              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT top 1 F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT top 1 FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
                 //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
                 sql,
                 "ORDER BY F_CREATEDATE desc",
@@ -1265,7 +1265,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
                 " T_Wo_WorkOrderBase T1 Inner join T_Wo_WorkOrderNotice T2 On T1.F_WORKORDERID=T2.OrderId  ",
                 "F_WORKORDERID",
               "T1.*,CONVERT(varchar,F_CREATEDATE, 120 ) as F_CREATEDATENew,NoticeDeptId,NoticeDeptName"
-              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
+              + @" , replace(replace(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT top 1 F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT top 1 FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END,'\','/'),'" + GetSysconfig("newFilePath") + "','" + GetSysconfig("newPlayPath") + "') as FilePath",
                 //+ " ,(CASE F_WORKORDERFROM WHEN '留言工单' THEN (SELECT F_RecFileUrl FROM dbo.T_Call_LeaveRecord  WHERE F_CallId=F_KSHADDRESSCODE) WHEN '语音工单' THEN (SELECT FilePath FROM dbo.T_Call_CallRecords WHERE CallId=F_KSHADDRESSCODE AND FilePath!='') ELSE NULL END ) as FilePath",
                 sql,
                 " F_CREATEDATE desc",
@@ -2376,7 +2376,7 @@ namespace YTSoft.BaseCallCenter.MVCWeb.Controllers
             string tableNew = "(select DISTINCT  t.*  ";
             tableNew += ", case WHEN F_SENTORDERTIME IS NULL AND DATEDIFF(minute, DATEADD(day,1,F_CREATEDATE),  GETDATE())> 0  THEN 0 WHEN F_SENTORDERTIME IS NULL  THEN 1 WHEN DATEDIFF(minute, DATEADD(day,1,F_CREATEDATE), F_SENTORDERTIME)> 0 THEN 0 ELSE 1 END AS turntime ";
             tableNew += " from T_Wo_WorkOrderBase t LEFT JOIN T_Wo_WorkOrderHistory h ON t.F_WORKORDERID=h.F_INSTANCEID LEFT JOIN T_Sys_UserAccount u ON  t.F_USERID= u.F_UserId";
-            tableNew += string.Format(" where(u.F_DeptId ={0}     OR h.F_OPTBTNID ={0}) and h.NeedReplayTime is not null and  (h.ReplayTime IS NULL AND DATEDIFF(second,  GETDATE(), h.NeedReplayTime)<0) OR (h.ReplayTime IS NOT NULL AND DATEDIFF(second,  h.ReplayTime, h.NeedReplayTime)<0)) as t", F_DeptId);
+            tableNew += " where  h.NeedReplayTime is not null and  (h.ReplayTime IS NULL AND DATEDIFF(second,  GETDATE(), h.NeedReplayTime)<0) OR (h.ReplayTime IS NOT NULL AND DATEDIFF(second,  h.ReplayTime, h.NeedReplayTime)<0)) as t";
             DataTable dt = new DataTable();
             int recordCount = 0;
             Model.PageData<Model.T_Wo_WorkOrderBase> pageModel = new Model.PageData<Model.T_Wo_WorkOrderBase>();