坐席工作报表接口调整

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

@@ -26,7 +26,7 @@ namespace CallCenterApi.Interface.Controllers.report
             //            ,"置忙平均休息分钟数","质检平均成绩"
             //    };
 
-            string[] str = { "部门", "坐席姓名", "角色", "固话号码",
+            string[] str = { "公司","部门", "坐席工号", "坐席姓名", "角色", "固话号码",
                              "呼入电话数", "接通量", "接通率", "呼入通话分钟数",
                              "呼出电话数", "呼通量", "呼通率", "呼出通话分钟数",
                              "坐席登录次数", "登录时长分钟数", "工作时长分钟数", "平均每天工作时长（小时）", "休息时长分钟数", "质检平均成绩"
@@ -418,7 +418,9 @@ namespace CallCenterApi.Interface.Controllers.report
             DataTable dtNew = new DataTable();
             #region
             dtNew.Columns.AddRange(new DataColumn[] {
+                 new DataColumn("公司"),
                  new DataColumn("部门"),
+                 new DataColumn("坐席工号"),
                  new DataColumn("坐席姓名"),
                  new DataColumn("角色"),
                  new DataColumn("固话号码"),
@@ -571,13 +573,13 @@ namespace CallCenterApi.Interface.Controllers.report
                     }
                     else if (deptId != 1)
                     {
-                        deptSQL += $" and F_DeptId={deptId} ";
+                        deptSQL += $" and t1.F_DeptId={deptId} ";
                     }
                     else
                     {
                         if (roleId != 53 && roleId != 54)
                         {
-                            deptSQL += $" and F_DeptId={deptId} ";
+                            deptSQL += $" and t1.F_DeptId={deptId} ";
                         }
 
                     }
@@ -595,11 +597,11 @@ namespace CallCenterApi.Interface.Controllers.report
             DataTable dtdpt = null;
             if (!string.IsNullOrWhiteSpace(dpt) && Convert.ToInt32(dpt) >= 0)
             {
-                dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_ParentId!=0 and F_DeptId=" + dpt + deptSQL).Tables[0];
+                dtdpt = DbHelperSQL.Query("select t1.F_DeptId,t1.F_DeptName,t1.F_Remark,t2.F_DeptName as ParentName from  T_Sys_Department t1 left join T_Sys_Department t2 ON t1.F_ParentId=t2.F_DeptId where t1.F_ParentId!=0 and t1.F_DeptId=" + dpt + deptSQL).Tables[0];
             }
             else
             {
-                dtdpt = DbHelperSQL.Query("select F_DeptId,F_DeptName,F_Remark from  T_Sys_Department where F_ParentId!=0" + deptSQL).Tables[0];
+                dtdpt = DbHelperSQL.Query("select t1.F_DeptId,t1.F_DeptName,t1.F_Remark,t2.F_DeptName as ParentName from  T_Sys_Department t1 left join T_Sys_Department t2 ON t1.F_ParentId=t2.F_DeptId where t1.F_ParentId!=0" + deptSQL).Tables[0];
             }
             //if (dtdpt != null && dtdpt.Rows.Count > 0)
             //{
@@ -617,8 +619,10 @@ namespace CallCenterApi.Interface.Controllers.report
                         //drNew["坐席"] = dt.Rows[i]["F_UserName"].ToString();
                         //drNew["坐席工号"] = dt.Rows[i]["F_WorkNumber"].ToString();
                         //drNew["角色"] = dt.Rows[i]["F_RoleName"].ToString();
+                        drNew["公司"] = dr["ParentName"].ToString();
                         drNew["部门"] = dr["F_DeptName"].ToString();
-                        drNew["坐席姓名"] = $"{dt.Rows[i]["F_WorkNumber"].ToString()}—{dt.Rows[i]["F_UserName"].ToString()}";
+                        drNew["坐席工号"] = $"{dt.Rows[i]["F_WorkNumber"].ToString()}";
+                        drNew["坐席姓名"] = $"{dt.Rows[i]["F_UserName"].ToString()}";
                         drNew["角色"] = dt.Rows[i]["F_RoleName"].ToString();
                         drNew["固话号码"] = dt.Rows[i]["F_ExtensionNumber"].ToString();