bug调整；读取斤30天数据；工单类型读取接口排序

CallCenterApi.Interface/Controllers/InfoController.cs

@@ -600,7 +600,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetAreaCountByDateNew(string branchcode, DateTime? start, DateTime? end, string areaid, int datetype = 0)
         {
-            DateTime stime = DateTime.Now.AddDays(1 - DateTime.Now.Day).Date;//当月第一天
+            DateTime stime = DateTime.Now.AddDays(-30).Date;//DateTime.Now.AddDays(1 - DateTime.Now.Day).Date;//当月第一天
             DateTime etime = DateTime.Now;
             string strstart = ""; string strend = "";
             if (start != null)
@@ -775,7 +775,7 @@ namespace CallCenterApi.Interface.Controllers
             if (start != null)
                 strstart = start.Value.ToString("yyyy-MM-dd");
             else
-                strstart = DateTime.Now.ToString("yyyy-MM-01");
+                strstart = DateTime.Now.AddDays(-30).Date.ToString("yyyy-MM-dd");//DateTime.Now.ToString("yyyy-MM-01");
             if (end != null)
                 strend = end.Value.ToString("yyyy-MM-dd");
             else
@@ -1957,7 +1957,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetKeyCountRankByDate(string branchcode, DateTime? start, DateTime? end, int datetype = 0, int keyid = 0)
         {
-            DateTime stime = DateTime.Now;
+            DateTime stime = DateTime.Now.AddDays(-30).Date;//DateTime.Now;
             DateTime etime = DateTime.Now;
             if (start != null)
             {
@@ -2016,7 +2016,7 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetDeptKeyCountByDateNew(string branchcode, DateTime? start, DateTime? end, int deptid = 0, int datetype = 0, int keyid = 0)
         {
-            DateTime stime = DateTime.Now;
+            DateTime stime = DateTime.Now.AddDays(-30).Date;//DateTime.Now;
             DateTime etime = DateTime.Now;
             if (start != null)
             {
@@ -2132,7 +2132,7 @@ namespace CallCenterApi.Interface.Controllers
         /// </summary>
         /// <param name="branchcode"></param>
         /// <returns></returns>
-        public ActionResult GetTypeCountNew(string branchcode, string areaid)
+        public ActionResult GetTypeCountNew(string branchcode, string areaid,string date)
         {
             if (branchcode == "sqs12345")
             {
@@ -2147,6 +2147,8 @@ namespace CallCenterApi.Interface.Controllers
             {
                 sqlwhere += " and F_IsSQ!=1";
             }
+            if (string.IsNullOrEmpty(date))
+                date = DateTime.Now.ToString("yyyy-MM-dd");
 
             #region 定义新表
             DataTable dtnew = new DataTable();
@@ -2173,7 +2175,7 @@ namespace CallCenterApi.Interface.Controllers
                         areaid = l.F_AreaId;
                     }
                     string signcode = CommonHelper.getsigncode(controllername, actionname, l.F_Sign);
-                    string strparams = "?signcode=" + signcode + "&areaid=" + areaid;
+                    string strparams = "?signcode=" + signcode + "&areaid=" + areaid+"&date="+ date;
 
                     string ar = HttpMethods.HttpGet(l.F_Url + "/" + controllername + "/" + actionname + strparams);//.ToObject<AjaxResult>();
 
@@ -2228,6 +2230,8 @@ namespace CallCenterApi.Interface.Controllers
                 }
             }
             #endregion
+            dtnew.DefaultView.Sort = "MonthCount DESC";
+            dtnew = dtnew.DefaultView.ToTable();
             return Success("成功", dtnew);
         }
 

CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -210,7 +210,15 @@ namespace CallCenterApi.Interface.Controllers
         public ActionResult GetNowUser()
         {
             Model.T_Sys_UserAccount userModel = new BLL.T_Sys_UserAccount().GetModel(User.UserData["F_UserCode"]);
-            return Success("获取成功", userModel);
+            if (userModel == null)
+                return Error("获取失败");
+            Model.T_Sys_RoleInfo roleModel = new BLL.T_Sys_RoleInfo().GetModel(userModel.F_RoleId);
+            var obj = new
+            {
+                user = userModel,
+                role = roleModel
+            };
+            return Success("获取成功", obj);
         }
         
         /// <summary>