修改bug

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

@@ -191,14 +191,6 @@ namespace CallCenterApi.Interface.Controllers
                     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 + "' ");
-
-                    //int daynocon = bll.GetList("CallType='0' and CONVERT(varchar(10),BeginTime, 23)='" + strDate + "' and CallState='0' ").Tables[0].Rows.Count;
-
                     var obj = new
                     {
                         dayin = new { count = dayinlist.Count, totaltime =DateTimeConvert.parseTimeSeconds(int.Parse(dayinlist.Select(p => p.TalkLongTime).Sum().ToString()),0) },
@@ -225,8 +217,8 @@ namespace CallCenterApi.Interface.Controllers
                 int userId = CurrentUser.UserData.F_UserId;
                 if (userId != 0)
                 {
-                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                    if (ua != null)
+                    Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                    if (userModel != null)
                     {
                         var date = DateTime.Now;//DateTime.Parse("2015-04-14"); //
                         string strDate = date.ToString("yyyy-MM-dd");
@@ -239,25 +231,25 @@ namespace CallCenterApi.Interface.Controllers
                         //var list4 = bll.GetList(" F_USERID='" + userId + "' and CONVERT(char(7),F_CREATEDATE,20)='" + strMonth + "' and F_WORKORDERSTATEID in (4,5,6,7,9,12,13) ").Tables[0];
 
                         string uwhere = " 1=1 ";
-                        if (ua.F_RoleId != 17)
+                        if (userModel.rolecode != "XTGLY")
                         {
-                            uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
+                            uwhere += " and F_CreateUser='" + userModel.F_UserCode + "' ";
                         }
 
-                        BLL.T_Wo_WorkOrder bll = new BLL.T_Wo_WorkOrder();
+                        BLL.T_Bus_WorkOrder bll = new BLL.T_Bus_WorkOrder();
                         //var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =2 and IsDel=0 ").Tables[0];
                         //var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State in (0,1) and IsDel=0 ").Tables[0];
                         //var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =2 and IsDel=0 ").Tables[0];
                         //var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State in (0,1) and IsDel=0 ").Tables[0];
 
                         //日已完成
-                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State =1 and IsDel=0 ").Tables[0];
+                        var list1 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State=1 and F_IsDelete=0 ").Tables[0];
                         //日未完成
-                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + strDate + "' and State=0 and IsDel=0 ").Tables[0];
+                        var list2 = bll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + strDate + "' and F_State=0 and F_IsDelete=0 ").Tables[0];
                         //月已完成
-                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State =1 and IsDel=0 ").Tables[0];
+                        var list3 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State=1 and F_IsDelete=0 ").Tables[0];
                         //月未完成
-                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),CreateTime,20)='" + strMonth + "' and State=0 and IsDel=0 ").Tables[0];
+                        var list4 = bll.GetList(uwhere + " and CONVERT(char(7),F_CreateTime,20)='" + strMonth + "' and F_State=0 and F_IsDelete=0 ").Tables[0];
 
                         var obj = new
                         {
@@ -284,8 +276,7 @@ namespace CallCenterApi.Interface.Controllers
             {
 
                 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;//DateTime.Parse("2014-05-05"); //
@@ -294,9 +285,9 @@ namespace CallCenterApi.Interface.Controllers
                     string[] cols = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10", "11", "12", "13", "14", "15", "16", "17", "18", "19", "20", "21", "22", "23", "24" };
 
                     string uwhere = " 1=1 ";
-                    if (roleid != 17)
+                    if (userModel.rolecode != "XTGLY")
                     {
-                        uwhere += " and UserCode='" + usercode + "' ";
+                        uwhere += " and UserCode='" + userModel.F_UserCode + "' ";
                     }
 
                     BLL.T_Call_CallRecords bll = new BLL.T_Call_CallRecords();
@@ -313,8 +304,8 @@ namespace CallCenterApi.Interface.Controllers
                     var obj = new
                     {
                         col = cols,
-                        total = total,
-                        count = count
+                        total,
+                        count
                     };
                     return Success("成功", obj);
                 }
@@ -329,93 +320,89 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetWorkTelByDay()
         {
-            
+
             if (Request.IsAuthenticated)
             {
 
                 int userId = CurrentUser.UserData.F_UserId;
-                if (userId != 0)
+                Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(userId);
+                if (userModel != null)
                 {
-                    Model.T_Sys_UserAccount ua = new BLL.T_Sys_UserAccount().GetModel(userId);
-                    if (ua != null)
-                    {
-                        var date = DateTime.Now;//DateTime.Parse("2015-04-05"); //
-                        string strDate = date.ToString("yyyy-MM");
+                    var date = DateTime.Now;//DateTime.Parse("2015-04-05"); //
+                    string strDate = date.ToString("yyyy-MM");
 
-                        int days = DateTime.DaysInMonth(date.Year, date.Month);
+                    int days = DateTime.DaysInMonth(date.Year, date.Month);
 
-                        string[] strcols = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10",
+                    string[] strcols = { "01", "02", "03", "04", "05", "06", "07", "08", "09", "10",
                                   "11", "12", "13", "14", "15", "16", "17", "18", "19", "20",
                                   "21", "22", "23", "24", "25", "26", "27", "28", "29", "30", "31" };
-                        int newcount = 0;
-                        List<string> cols = strcols.Take(days).ToList();
-                        BLL.T_Call_CallRecords telbll = new BLL.T_Call_CallRecords();
-                        //BLL.T_Wo_WorkOrderBase workbll = new BLL.T_Wo_WorkOrderBase();
-                        BLL.T_Wo_WorkOrder workbll = new BLL.T_Wo_WorkOrder();
-                        int[] teltotal = new int[days];
-                        int[] worktotal = new int[days];
-
-                        string uwhere = " 1=1 ";
-                        string u1where = " 1=1 ";
-                        if (ua.F_RoleId != 17)
-                        {
-                            uwhere += " and CreateUser='" + ua.F_UserCode + "' ";
-                            u1where += " and UserCode='" + ua.F_UserCode + "' ";
-                        }
+                    int newcount = 0;
+                    List<string> cols = strcols.Take(days).ToList();
+                    BLL.T_Call_CallRecords telbll = new BLL.T_Call_CallRecords();
+                    //BLL.T_Wo_WorkOrderBase workbll = new BLL.T_Wo_WorkOrderBase();
+                    BLL.T_Bus_WorkOrder workbll = new BLL.T_Bus_WorkOrder();
+                    int[] teltotal = new int[days];
+                    int[] worktotal = new int[days];
+
+                    string uwhere = " F_IsDelete=0 ";
+                    string u1where = " 1=1 ";
+                    if (userModel.rolecode != "XTGLY")
+                    {
+                        uwhere += " and F_CreateUser='" + userModel.F_UserCode + "' ";
+                        u1where += " and UserCode='" + userModel.F_UserCode + "' ";
+                    }
 
-                        for (int i = 0; i < cols.Count; i++)
-                        {
-                            //var tellist = telbll.GetModelList(" UserId='" + userId + "' and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
-                            var tellist = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
-                            teltotal[i] = tellist.Count;
-                            newcount = newcount + tellist.Count;
-                            //var worklist = workbll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
-                            var worklist = workbll.GetList(uwhere + " and CONVERT(varchar(10),CreateTime, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
-                            worktotal[i] = worklist.Rows.Count;
-                        }
+                    for (int i = 0; i < cols.Count; i++)
+                    {
+                        //var tellist = telbll.GetModelList(" UserId='" + userId + "' and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
+                        var tellist = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)='" + (strDate + "-" + cols[i]) + "' ");
+                        teltotal[i] = tellist.Count;
+                        newcount = newcount + tellist.Count;
+                        //var worklist = workbll.GetList(" F_USERID='" + userId + "' and CONVERT(varchar(10),F_CREATEDATE, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
+                        var worklist = workbll.GetList(uwhere + " and CONVERT(varchar(10),F_CreateTime, 23)='" + (strDate + "-" + cols[i]) + "' ").Tables[0];
+                        worktotal[i] = worklist.Rows.Count;
+                    }
 
-                        var olddate = date.AddYears(-1);
-                        string strold1 = olddate.ToString("yyyy-MM") + "-1";
-                        string strold2 = olddate.ToString("yyyy-MM-dd");
+                    var olddate = date.AddYears(-1);
+                    string strold1 = olddate.ToString("yyyy-MM") + "-1";
+                    string strold2 = olddate.ToString("yyyy-MM-dd");
 
-                        string bl = string.Empty;
-                        var oldcount = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)>='" + strold1 + "' and CONVERT(varchar(10),BeginTime, 23)<='" + strold2 + "' ").Count;
+                    string bl = string.Empty;
+                    var oldcount = telbll.GetModelList(u1where + " and CONVERT(varchar(10),BeginTime, 23)>='" + strold1 + "' and CONVERT(varchar(10),BeginTime, 23)<='" + strold2 + "' ").Count;
 
-                        if (oldcount == newcount)
-                        {
-                            bl = " 持平";
-                        }
-                        else
+                    if (oldcount == newcount)
+                    {
+                        bl = " 持平";
+                    }
+                    else
+                    {
+                        if (newcount != 0)
                         {
-                            if (newcount != 0)
+                            if (oldcount > newcount)
                             {
-                                if (oldcount > newcount)
-                                {
-                                    bl = " ↓ " + (Convert.ToDouble(oldcount - newcount) / Convert.ToDouble(newcount)).ToString("0.0%");
-                                }
-                                else if (oldcount < newcount)
-                                {
-                                    bl = " ↑ " + (Convert.ToDouble(newcount - oldcount) / Convert.ToDouble(newcount)).ToString("0.0%");
-                                }
+                                bl = " ↓ " + (Convert.ToDouble(oldcount - newcount) / Convert.ToDouble(newcount)).ToString("0.0%");
                             }
-                            else
+                            else if (oldcount < newcount)
                             {
-                                bl = " --";
+                                bl = " ↑ " + (Convert.ToDouble(newcount - oldcount) / Convert.ToDouble(newcount)).ToString("0.0%");
                             }
                         }
-
-                        var obj = new
+                        else
                         {
-                            bl = bl,
-                            col = cols.Select(p => p + "日"),
-                            worktotal = worktotal,
-                            teltotal = teltotal
-                        };
-
-                        return Success("成功", obj);
+                            bl = " --";
+                        }
                     }
-                }
 
+                    var obj = new
+                    {
+                        bl,
+                        col = cols.Select(p => p + "日"),
+                        worktotal,
+                        teltotal
+                    };
+
+                    return Success("成功", obj);
+                }
             }
             return NoToken("未知错误，请重新登录");
         }