1

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -179,6 +179,17 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     }
 
                 }
+                string deptname = "";
+                if (dModel.F_DeptId>0)
+                {
+                    var keyvalue = new BLL.T_Sys_Department ().GetModel(dModel.F_DeptId.Value);
+                    if (keyvalue != null)
+                    {
+                        deptname = keyvalue.F_DeptName ;
+                        
+                    }
+
+                }
                 var obj = new
                 {
                     F_RepositoryId = dModel.F_RepositoryId,
@@ -193,6 +204,8 @@ namespace CallCenterApi.Interface.Controllers.knowledge
                     F_AuditBy = auditu,
                     F_KeyWords = dModel.F_KeyWords ,
                     KeyName,
+                    DeptName= deptname,
+                    F_DeptId = dModel.F_DeptId,
                     key1,
                     F_Key = dModel.F_Key,
                 };

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/report/TotalTelController.cs

@@ -161,15 +161,35 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             if (isdc > 0)
             {
-                NPOIHelper npoi = new NPOIHelper();
-                if (npoi.TotalTel ("话务报表", dataTable) == "")
+                if (isdc==2)
                 {
-                    return Success("导出成功");
+                    NPOIHelper npoi = new NPOIHelper();
+                    dataTable = dataTable.DefaultView.ToTable(false, new string[] { "时间", "转坐席总量", "呼入接通量",
+                "接通率"
+         });
+                    string[] cols = { "时间", "呼入总量", "接听量", "接通率" };
+                    if (npoi.ExportToExcel("话务报表", dataTable, cols) == "")
+                    {
+                        return Success("导出成功");
+                    }
+                    else
+                    {
+                        return Error("导出失败");
+                    }
                 }
                 else
                 {
-                    return Error("导出失败");
+                    NPOIHelper npoi = new NPOIHelper();
+                    if (npoi.TotalTel("话务报表", dataTable) == "")
+                    {
+                        return Success("导出成功");
+                    }
+                    else
+                    {
+                        return Error("导出失败");
+                    }
                 }
+               
             }
             else
                 return Success("获取成功", dataTable);

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

@@ -2488,8 +2488,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += "and F_SpotCheck=1";
                     if (visit > -2)
                     {
+                        string where = "";
+                        if (visitstarttime.Trim() != "" && visitstarttime != "undefined")
+                        {
+                            where += " and  F_CreateTime>='" + visitstarttime + "' ";
+                        }
+                        if (visitstrendtime.Trim() != "" && visitstrendtime != "undefined")
+                        {
+                            where += " and F_CreateTime<='" + visitstrendtime + "' ";
+                        }
+                        if (visituser.Trim() != "" && visituser != "undefined")
+                        {
+                            where += " and F_CreateUser='" + visituser + "'";
+                        }
+
+
                         sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) " +
-                            "from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '" + visit + "' ";
+                            "from T_Bus_VisitResult WITH(NOLOCK)  where 1=1 "+ where + " group by F_WorkOrderId ) and F_IsSatisfie = '" + visit + "' ";
 
                     }
                     else