修改bug

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/IndexController.cs

@@ -166,8 +166,7 @@ namespace CallCenterApi.Interface.Controllers
             if (Request.IsAuthenticated)
             {
                 int userId = CurrentUser.UserData.F_UserId;
-                string usercode = CurrentUser.UserData.F_UserCode;
-                int roleid = CurrentUser.UserData.F_RoleId;
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
                 if (userId != 0)
                 {
                     var date = DateTime.Now;
@@ -175,25 +174,30 @@ namespace CallCenterApi.Interface.Controllers
                     string strMonth = date.ToString("yyyy-MM");
 
                     string uwhere = " 1=1 ";
-                    if (roleid != 17)
+                    if (userModel.rolecode != "XTGLY")
                     {
-                        uwhere += " and UserCode='" + usercode + "' ";
+                        uwhere += " and UserCode='" + userModel.F_UserCode + "' ";
+                    }
+
+                    if (!string.IsNullOrEmpty(userModel.groupcode))
+                    {
+                        uwhere += " and groupcode = '" + userModel.groupcode + "' ";
                     }
 
                     BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
-                    //var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
-                    //var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
-                    //var moninlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' and CallState='1' ");
-                    //var monoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' and CallState='1' ");
-                    //int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(100),BeginTime, 23)='" + strDate + "' and CallState='0' ").Tables[0].Rows.Count;
+                    var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
+                    var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='1' ");
+                    var moninlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' and CallState='1' ");
+                    var monoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' and CallState='1' ");
+                    int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(100),BeginTime, 23)='" + strDate + "' and CallState='0' ").Tables[0].Rows.Count;
 
-                    //2018-05-03 lihai 首页统计问题
-                    var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' ");
-                    var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' ");
-                    var moninlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' ");
-                    var monoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' ");
+                    ////2018-05-03 lihai 首页统计问题
+                    //var dayinlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' ");
+                    //var dayoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' ");
+                    //var moninlist = bll.GetModelList(uwhere + " and CallType='0' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' ");
+                    //var monoutlist = bll.GetModelList(uwhere + " and CallType='1' and CONVERT(char(7),BeginTime,20)='" + strMonth + "' ");
 
-                    int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(100),BeginTime, 23)='" + strDate + "' ").Tables[0].Rows.Count;
+                    //int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='0' ").Tables[0].Rows.Count;
 
                     var obj = new
                     {
@@ -201,7 +205,7 @@ namespace CallCenterApi.Interface.Controllers
                         dayout = new { count = dayoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(dayoutlist.Select(p => p.TalkLongTime).Sum().ToString()), 0) },
                         monin = new { count = moninlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(moninlist.Select(p => p.TalkLongTime).Sum().ToString()),0) },
                         monout = new { count = monoutlist.Count, totaltime = DateTimeConvert.parseTimeSeconds(int.Parse(monoutlist.Select(p => p.TalkLongTime).Sum().ToString()),0) },
-                        daynocon = daynocon
+                        daynocon
                     };
                     res = Success("成功", obj);
                 }

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

@@ -17,24 +17,11 @@ namespace CallCenterApi.Interface.Controllers.tel
         //获取通话记录列表
         public ActionResult GetList(string phone, string usercode)
         {
-            //ActionResult res = NoToken("未知错误，请重新登录");
-            //if (Request.IsAuthenticated)
-            //{              
+            int userId = CurrentUser.UserData.F_UserId;
+            Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
 
-            //}
-            //return res;
             string sql = "";
-            int roleid = 0, deptid = 0;
-            string currcode = string.Empty;
-            string deptcode = string.Empty;
-            DataTable dt = new DataTable();
-            if (Request.IsAuthenticated)
-            {
-                roleid = CurrentUser.UserData.F_RoleId;
-                currcode = CurrentUser.UserData.F_UserCode;
-                deptid = CurrentUser.UserData.F_DeptId;
-                deptcode = CurrentUser.UserData.F_DeptCode;
-            }
+            
             string callstate = HttpUtility.UrlDecode(RequestString.GetQueryString("callstate"));
             string calltype = HttpUtility.UrlDecode(RequestString.GetQueryString("calltype"));
             string starttime = HttpUtility.UrlDecode(RequestString.GetQueryString("starttime"));
@@ -47,73 +34,10 @@ namespace CallCenterApi.Interface.Controllers.tel
             string strpagesize = RequestString.GetQueryString("pagesize");
             int pagesize = 10;
 
-            //if (roleid != 0)
-            //{
-            //    if (roleid != 17)
-            //    {
-            //        if (deptcode.IndexOf("|533|") > 0)
-            //        {
-            //            sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + deptid + ")";
-            //        }
-            //        if (deptcode.IndexOf("|531|") > 0)
-            //        {
-            //            if (roleid == 32)
-            //            {
-            //                usercode = CurrentUser.UserData.F_UserCode;
-            //                sql += " and UserCode='" + usercode + "'";
-            //            }
-            //            else
-            //            {
-            //                sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptID in (select F_DeptId from T_Sys_Department where F_DeptCode like '" + deptcode + "%')) ";
-            //            }
-            //        }
-            //    }
-            //}
-            ////20180515 坐席能看到同组的 
-            //var usergroup = new BLL.T_Sys_UserAccount().GetModel(currcode) == null ? "" : new BLL.T_Sys_UserAccount().GetModel(currcode).F_SeartGroup;
-            //var usercodes = new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'") == null ? null : new BLL.T_Sys_UserAccount().GetModelList("F_SeartGroup='" + usergroup + "'").Select(p => p.F_UserCode);
-            //var str = "";
-            //if (usercodes != null)
-            //{
-            //    foreach (var item in usercodes)
-            //    {
-            //        str += item.ToString() + ',';
-            //    }
-            //    str = str.TrimEnd(',');
-            //    sql += " and UserCode in (" + str + ") ";
-            //}
-            //else
-            //    sql += " and UserCode='" + usercode + "' ";
-            #region 2018-05-30 lihai 坐席能看到同组的通话记录
-            int seartGroupId = 0;
-            var modelUser = new BLL.T_Sys_UserAccount().GetModel(currcode);
-            if (modelUser != null)
-                seartGroupId = modelUser.F_SeartGroupID ?? 0;
-            if (seartGroupId != 0)
+            if (!string.IsNullOrEmpty(userModel.groupcode))
             {
-                //groupcode判断是市场部或客服部的通话记录
-                var modelSeartGroup = new BLL.T_Sys_SeatGroup().GetModel(seartGroupId);
-                if (modelSeartGroup != null)
-                {
-                    sql += " and groupcode = '" + modelSeartGroup.F_ZXZCode + "' ";
-                    //if (modelSeartGroup.F_ZXZCode == "SCZ")
-                    //{
-                    //    sql += " and groupcode = 'SCZ' ";
-                    //}
-                    //else
-                    //{
-                    //    sql += " and groupcode = 'KFZ' ";
-                    //}
-                }
-                //else
-                //    sql += " and UserCode='" + usercode + "' ";
+                sql += " and groupcode = '" + userModel.groupcode + "' ";
             }
-            //else
-            //{
-            //    //找不到对应坐席组
-            //    sql += " and UserCode='" + usercode + "' ";
-            //}
-            #endregion
 
             if (usercode != null && usercode.Trim() != "")
             {
@@ -121,7 +45,7 @@ namespace CallCenterApi.Interface.Controllers.tel
             }
             if (dept != null && dept.Trim() != "")
             {
-                sql += " and UserCode in (select F_UserCode from T_Sys_UserAccount where F_DeptId=" + dept.Trim() + ")";
+                sql += " and F_DeptId='" + dept.Trim() + "'";
             }
             if (dealtype != null && dealtype.Trim() != "")
             {
@@ -159,10 +83,10 @@ namespace CallCenterApi.Interface.Controllers.tel
                 pagesize = Convert.ToInt32(strpagesize);
             }
             int recordCount = 0;
-            dt = BLL.PagerBLL.GetListPager(
-                "T_Call_CallRecords left join T_Sys_UserAccount on UserCode=F_UserCode",
+            DataTable dt = BLL.PagerBLL.GetListPager(
+                "T_Call_CallRecords left join T_Sys_UserAccount on UserCode=F_UserCode  ",
                 "CallRecordsId",
-                "T_Call_CallRecords.*,T_Sys_UserAccount.F_SeartGroup",
+                "T_Call_CallRecords.*,T_Sys_UserAccount.F_UserName as UserName,T_Sys_UserAccount.F_SeartGroup,T_Sys_UserAccount.F_DeptId",
                 sql,
                 "ORDER BY CallRecordsId desc",
                 pagesize,
@@ -188,24 +112,6 @@ namespace CallCenterApi.Interface.Controllers.tel
                     }
                     dr["FilePath"] = ym + path.Substring(path.IndexOf(':') + 1).Replace('\\', '/');
                 }
-                string ucode = dr["UserCode"] != null ? dr["UserCode"].ToString() : "";
-                string uname = dr["UserName"] != null ? dr["UserName"].ToString() : "";
-                if (ucode != "")
-                {
-                    if (uname == "")
-                    {
-                        var uu = users.Where(u => u.F_UserCode.Equals(ucode)).FirstOrDefault();
-                        if (uu != null)
-                            dr["UserName"] = uu.F_UserName;
-                    }
-                }
-                var modelCustomer = listCustomer.FirstOrDefault(x => x.F_Telephone == dr["CallNumber"].ToString());
-                if (modelCustomer != null)
-                {
-                    dr["CusName"] = modelCustomer.F_CustomerName;           //客户姓名
-                    dr["CusDepName"] = modelCustomer.F_CustomerIndustry;    //来电单位
-                }
-                //dr["CusName"] = new BLL.T_Cus_CustomerBase().GetModelList("F_Telephone='" + dr["CallNumber"] + "' and F_DeleteFlag=0").FirstOrDefault() == null ? "" : new BLL.T_Cus_CustomerBase().GetModelList("F_Telephone='" + dr["CallNumber"] + "'").FirstOrDefault().F_CustomerName;
             }
 
             var obj = new