部门添加添加，报表数据跟工单查询数据不统一修改

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

@@ -200,7 +200,12 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             //获取坐席数据
             DataTable dt = new DataTable();
-            string sql = "SELECT * from T_Sys_UserAccount where F_DeleteFlag=0 order by F_Userid asc";
+            string sqlUser = "";
+            if (dpt != null && dpt.Trim() != "")
+            {
+                sqlUser += $" and F_DeptId = {dpt} ";
+            }
+            string sql = $"SELECT * from T_Sys_UserAccount where F_DeleteFlag=0 {sqlUser} order by F_Userid asc";
             dt = DbHelperSQL.Query(sql).Tables[0];
             for (int i = 0; i < dt.Rows.Count; i++)
             {
@@ -210,7 +215,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 int sum = 0;
                 for (int j = 0; j < cateid.Length; j++)
                 {
-                    string str = "select count(*) from T_Wo_WorkOrder where IsDel=0 and typeclass=" + cateid[j] + " and CreateUser='" + dt.Rows[i]["F_UserCode"].ToString() + "'" + sqltimeCallRecords;
+                    string str = "select count(*) from T_Wo_WorkOrder where IsDel=0 and typeclass=" + cateid[j] + " and (CreateUser='" + dt.Rows[i]["F_UserCode"].ToString() + "' or LastDealUser = '" + dt.Rows[i]["F_UserCode"].ToString() + "')" + sqltimeCallRecords;
                     int ecount = int.Parse(DbHelperSQL.GetSingle(str).ToString());
 
                     sum += ecount;

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

@@ -204,7 +204,12 @@ namespace CallCenterApi.Interface.Controllers.report
             }
             //获取坐席数据
             DataTable dt = new DataTable();
-            string sql = "SELECT * from T_Sys_UserAccount where F_DeleteFlag=0 order by F_Userid asc";
+            string sqlUser = "";
+            if (dpt != null && dpt.Trim() != "")
+            {
+                sqlUser += $" and F_DeptId = {dpt} ";
+            }
+            string sql = $"SELECT * from T_Sys_UserAccount where F_DeleteFlag=0 {sqlUser} order by F_Userid asc";
             dt = DbHelperSQL.Query(sql).Tables[0];
             for (int i = 0; i < dt.Rows.Count; i++)
             {
@@ -214,7 +219,7 @@ namespace CallCenterApi.Interface.Controllers.report
                 int sum = 0;
                 for (int j = 0; j < cateid.Length; j++)
                 {
-                    string str = "select count(*) from T_Wo_WorkOrder where IsDel=0 and typeclass=" + cateid[j] + " and CreateUser='" + dt.Rows[i]["F_UserCode"].ToString() + "'" + sqltimeCallRecords;
+                    string str = "select count(*) from T_Wo_WorkOrder where IsDel=0 and typeclass=" + cateid[j] + " and (CreateUser='" + dt.Rows[i]["F_UserCode"].ToString() + "' or LastDealUser = '" + dt.Rows[i]["F_UserCode"].ToString() + "')" + sqltimeCallRecords;
                     int ecount = int.Parse(DbHelperSQL.GetSingle(str).ToString());
 
                     sum += ecount;

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

@@ -123,7 +123,12 @@ namespace CallCenterApi.Interface.Controllers.report
                 drNew["省份"] = f_prov;
                 //获取工单来源数据
                 DataTable dtnew = new DataTable();
-                string sqlnew = "select * from T_Sys_UserAccount where 1=1 and F_DeleteFlag=0";
+                string sqlUser = "";
+                if (dpt != null && dpt.Trim() != "")
+                {
+                    sqlUser += $" and F_DeptId = {dpt} ";
+                }
+                string sqlnew = $"select * from T_Sys_UserAccount where 1=1 and F_DeleteFlag=0 {sqlUser} ";
                 dtnew = DbHelperSQL.Query(sqlnew).Tables[0];
                 int sum = 0;
                 for (int j = 0; j < dtnew.Rows.Count; j++)
@@ -141,6 +146,25 @@ namespace CallCenterApi.Interface.Controllers.report
                 dtNew.Rows.Add(drNew);
             }
 
+            DataRow drsum = dtNew.NewRow();
+            drsum[0] = "总计";
+
+            for (int i = 1; i < dtNew.Columns.Count; i++)
+            {
+                int ecount = 0;
+                int sum = 0;
+                for (int j = 0; j < dtNew.Rows.Count; j++)
+                {
+                    if (dtNew.Rows[j][i] != null)
+                    {
+                        ecount = int.Parse(dtNew.Rows[j][i].ToString());
+                        sum += ecount;
+                    }
+                }
+                drsum[i] = sum;
+            }
+            dtNew.Rows.Add(drsum);
+
             return dtNew;
         }
 

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

@@ -913,8 +913,8 @@ namespace CallCenterApi.Interface.Controllers.tel
             ActionResult res = NoToken("未知错误，请重新登录");
             if (Request.IsAuthenticated)
             {
-
-                List<Model.T_Sys_UserAccount> userModel = new BLL.T_Sys_UserAccount().GetModelList("F_DeleteFlag=0");
+                int depid = CurrentUser.UserData.F_DeptId;
+                List<Model.T_Sys_UserAccount> userModel = new BLL.T_Sys_UserAccount().GetModelList($"F_DeleteFlag=0 and F_DeptId = {depid} ");
                 var list = userModel.Select(p => new { p.F_UserId, p.F_UserCode, p.F_UserName });
                 var obj = new
                 {