用户权限，超期修改

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/UserAccountController.cs

@@ -568,7 +568,8 @@ namespace CallCenterApi.Interface.Controllers
         /// <returns></returns>
         public ActionResult GetDeptUserList(int deptid = 0)
         {
-            List<Model.T_Sys_UserAccount> DeptUserList = sysUserAccountBll.GetModelList(" 1=1 and F_DeptId=" + deptid + " order by f_userid desc ");
+
+            List<Model.T_Sys_UserAccount> DeptUserList = sysUserAccountBll.GetModelList(" 1=1 and F_DeptId=" + deptid + "and F_DeleteFlag=0  order by f_userid desc ");
             var rolelist = new BLL.T_Sys_RoleInfo().GetModelList("").ToList();
             foreach (var item in DeptUserList)
             {

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

@@ -3317,7 +3317,7 @@ question, int page = 1, int limit = 10)
                                         {
                                             if (timeover != "")
                                             {
-                                                if (x > y)
+                                                if (y  > x )
                                                 {
                                                     System.TimeSpan id = DateTime.Parse(timeover2) - DateTime.Parse(timeover);
                                                     double a = id.TotalHours;
@@ -3562,7 +3562,7 @@ question, int page = 1, int limit = 10)
                                                 {
                                                     if (timeover != "")
                                                     {
-                                                        if (x > y)
+                                                        if (y  > x)
                                                         {
                                                             System.TimeSpan id = DateTime.Parse(timeover2) - DateTime.Parse(timeover);
                                                             double a = id.TotalHours;
@@ -4425,7 +4425,7 @@ question, int page = 1, int limit = 10)
                 {
                     if (time1 != "")
                     {
-                        if (x > y)
+                        if (y  > x )
                         {
                             System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
                             float b = time - (float)a.TotalHours;

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/weixin/WxLoginController.cs

@@ -2783,7 +2783,21 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     model.F_AuditBy = model1[i].F_AuditBy;//审核人
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
-                    model.RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(model1[i].F_ID, model1[i].F_limit)));
+                                                              // model.RemainingTime = float.Parse(string.Format("{0:f2}", TimeToOver(model1[i].F_ID, model1[i].F_limit)));
+
+                    float c = TimeToOver(model1[i].F_ID, model1[i].F_limit);
+                   float a = Math.Abs(c);
+                    int days = (int)Math.Floor(Convert.ToDouble(a / 24));
+                    int hours = days > 0
+                                   ? (int)Math.Floor(Convert.ToDouble((a - days * 24)))
+                                   : (int)Math.Floor(Convert.ToDouble(a));
+                    float minutes = hours > 0
+                                   ? a * 60 - days * 1440 - hours * 60
+                                   : 0;
+                    if (c > 0)
+                    model.RemainingTime = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
+                    else
+                        model.RemainingTime = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
                     if (ua != null)
                     {
                         var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
@@ -2802,6 +2816,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
 
                     }
+                    model.F_limit = model1[i].F_limit;
+                    int day = (int)Math.Floor(Convert.ToDouble(model.F_limit / 24));
+                    int hour = day > 0
+                                   ? (int)Math.Floor(Convert.ToDouble((model.F_limit - day * 24)))
+                                   : (int)Math.Floor(Convert.ToDouble(model.F_limit));
+
+                    string time = "";
+                    if (day > 0) time += day + "天";
+                    if (hour > 0) time += hour + "小时";
+                    model.F_limitTime = time;
                     if (model1[i].F_Type !="3")
                     {
                         if (TimeToOver(model1[i].F_ID, model1[i].F_limit) < 0)
@@ -2861,7 +2885,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (itemlasts[i].F_WoState >= 1)
                     {
                       
-                        if (itemlasts[i].F_WoState == 11)
+                        if (itemlasts[i].F_WoState == 10 || itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -2872,7 +2896,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (time1 != "")
                     {
-                        if (x > y)
+                        if (y >x  )
                         {
                             System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
                             float b = limit - (float)a.TotalHours;
@@ -3976,6 +4000,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             if (clus.F_WorkNumber == "7000")
                                 return Error("不能转派到市场管理员");
+                            else if (clus.F_RoleId == 1 || clus.F_RoleId == 4)
+                                return Error("不能转派到话务人员");
                             else if (clus.F_RoleId == 58)
                                 return Error("不能转派到业务员");
                             else if (clus.F_RoleId == 60)
@@ -4143,7 +4169,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     sql = " and F_RoleId=59";
                 }
-                var list = userAccountBLL.GetModelList(" F_DeptId='" + clbm + "'"+ sql);
+                var list = userAccountBLL.GetModelList(" F_DeptId='" + clbm + "'and F_DeleteFlag=0" + sql);
                 foreach (var l in list)
                 {
                     if (string.IsNullOrEmpty(users))
@@ -4458,7 +4484,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (itemlasts[i].F_WoState >= 1)
                     {
                       
-                        if (itemlasts[i].F_WoState == 11)
+                        if (itemlasts[i].F_WoState == 10)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -4469,7 +4495,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     if (time1 != "")
                     {
-                        if (x > y)
+                        if (y > x )
                         {
                             System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
                             if ((float)a.TotalHours > time)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderNewController.cs

@@ -4705,8 +4705,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_IsVisit ="否";//
                     }
-                   
-                    model.RemainingTime =float .Parse (string .Format ("{0:f2}", TimeToOver(model1[i].F_ID, model1[i].F_limit)) );
+                    float c = TimeToOver(model1[i].F_ID, model1[i].F_limit);
+                    float a = Math.Abs(c);
+                    int days = (int)Math.Floor(Convert.ToDouble(a / 24));
+                    int hours = days > 0
+                                   ? (int)Math.Floor(Convert.ToDouble((a - days * 24)))
+                                   : (int)Math.Floor(Convert.ToDouble(a));
+                    float minutes = hours > 0
+                                   ? a * 60 - days * 1440 - hours * 60
+                                   : 0;
+                    if (c > 0)
+                        model.RemainingTime = string.Format("剩余{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
+                    else
+                        model.RemainingTime = string.Format("超时{0:f0}天{1:f0}时{2:f0}分", days, hours, minutes);
+
                     model.F_VisitOn = model1[i].F_VisitOn;//回访时间
                     model.F_VisitBy = model1[i].F_VisitBy;//回访人
                     model.F_VisitResult = model1[i].F_VisitResult;//回访结果：非常满意、满意、一般、不满意
@@ -4748,8 +4760,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_AuditState = "";
                     }
+                   
                     model .F_Canal = model1[i].F_Canal;
                     model .F_limit = model1[i].F_limit ;
+                    int day = (int)Math.Floor(Convert.ToDouble(model.F_limit / 24));
+                    int hour = day > 0
+                                   ? (int)Math.Floor(Convert.ToDouble((model.F_limit - day * 24) ))
+                                   : (int)Math.Floor(Convert.ToDouble(model.F_limit));
+                   
+                    string time = "";
+                    if (day > 0) time += day + "天";
+                    if (hour > 0) time += hour + "小时";
+                        model.F_limitTime = time;
                     model.F_AuditBy = model1[i].F_AuditBy;//审核人
                     model.F_AuditOn = model1[i].F_AuditOn;//审核时间
                     model.F_AuditCont = model1[i].F_AuditCont;//审核内容
@@ -4880,7 +4902,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (itemlasts[i].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 11)
+                        if (itemlasts[i].F_WoState == 10|| itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -4891,7 +4913,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (time1 != "")
                     {
-                        if (x > y)
+                        if (y > x )
                         {
                             System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
                             float b = limit - (float)a.TotalHours;
@@ -4957,7 +4979,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (itemlasts[i ].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 11)
+                        if (itemlasts[i].F_WoState == 10 || itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -4968,7 +4990,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (time1 != "")
                     {
-                        if (x > y)
+                        if (y >x  )
                         {
                             System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
                            
@@ -5444,6 +5466,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (clus.F_WorkNumber == "7000")
                             return Error("不能转派到市场管理员");
+                        else if (clus.F_RoleId == 1|| clus.F_RoleId == 4)
+                            return Error("不能转派到话务人员");
                         else if (clus.F_RoleId == 58)
                             return Error("不能转派到业务员");
                         else if (clus.F_RoleId == 60)
@@ -7111,7 +7135,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     sql = " and F_RoleId=59";
                 }
-                var list = sysUserAccountBll.GetModelList(" F_DeptId='" + clbm + "'"+ sql);
+                var list = sysUserAccountBll.GetModelList(" F_DeptId='" + clbm + "' and F_DeleteFlag=0 " + sql);
                 foreach (var l in list)
                 {
                     if (string.IsNullOrEmpty(users))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Input/WorkOrderNewInput.cs

@@ -148,10 +148,11 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 剩余时间
         /// </summary>
-        public float RemainingTime
+        public string  RemainingTime
         {
             get; set;
         }
+       
         /// <summary>
         /// 处理方式:当即办理、电话转接、网络转办
         /// </summary>
@@ -613,6 +614,10 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
+        public string  F_limitTime
+        {
+            get; set;
+        }
         /// <summary>
         /// 审核人
         /// </summary>