工单流程修改，超期修改，用户管理修改

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

@@ -45,8 +45,11 @@ namespace CallCenterApi.Interface.Controllers
                 }
                 if (!string.IsNullOrWhiteSpace(filter.Key))
                 {
+                 
                     sql = "";
-                    string str = string.Format(" and (F_UserCode like '%{0}%' or F_UserName like '%{1}%')", filter.Key, filter.Key);
+                    string str = string.Format(" and (F_WorkNumber like '%{0}%' or F_UserName like '%{1}%'" +
+                        "or F_Mobile like '%{2}%' "+
+                        "or F_Remark like '%{3}%')", filter.Key, filter.Key, filter.Key, filter.Key);
                     sql += str;
                 }
                 int recordCount = 0;

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

@@ -2458,6 +2458,7 @@ question, int page = 1, int limit = 10)
                         if (itemList[0].F_NextDept > 0)
                         {
                             var deptmodel = departmentBLL.GetModel(int.Parse(itemList[0].F_NextDept.ToString()));
+
                             if (model.overdue.Count > 0)
                             {
                                  
@@ -2489,8 +2490,17 @@ question, int page = 1, int limit = 10)
                                 templates.number = 1;
                                 model.overdue.Add(templates);
                             }
-
-
+                        }
+                        else
+                        {
+                            if (itemList[0].F_WoState ==10)
+                            {
+                                var deptmodel = departmentBLL.GetModel(2);
+                                Template templates = new Template();
+                                templates.name = deptmodel.F_DeptName;
+                                templates.number = 1;
+                                model.overdue.Add(templates);
+                            }
                         }
                     }
                 }
@@ -2580,7 +2590,7 @@ question, int page = 1, int limit = 10)
         {
             int type = 0;
             var modlelist = workOrder.GetModelList(" F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")");
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish + ")");
             if (modlelist.Count > 0)
             {
                 foreach (var it in modlelist)
@@ -2615,22 +2625,30 @@ question, int page = 1, int limit = 10)
         /// <returns></returns>
         private bool TimeforOver(int id)
         {
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
+            var itemlasts = itembll.GetModelList("  F_WoID=" + id + " order by F_ID desc");
             string time1 = "", time2 = ""; int x = 0, y = 0;
             float time = 0;
             if (itemlasts.Count > 0)
             {
-                for (int i = 0; i < itemlasts.Count; i++)
+                for (int z = 0; z < itemlasts.Count; z++)
                 {
-                    if (itemlasts[i].F_WoState >= 1)
+                    if (itemlasts[z].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 1)
+                        if (itemlasts[z].F_WoState == 1)
                         {
-                            x = i;
-                            time1 = itemlasts[i].F_CreateTime.ToString();
-                            time = float.Parse(itemlasts[i].F_LimitTime);
+                            x = z;
+                            time1 = itemlasts[z].F_CreateTime.ToString();
+                            time = float.Parse(itemlasts[z].F_LimitTime);
+                            break; ;
                         }
-                        if (itemlasts[i].F_WoState == 10)
+                    }
+                }
+                for (int i = 0; i < itemlasts.Count; i++)
+                {
+                   
+                    if (itemlasts[i].F_WoState >= 1)
+                    {
+                        if (itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -2643,16 +2661,17 @@ question, int page = 1, int limit = 10)
                     {
                         if (x > y)
                         {
-                            int a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            if (a > time)
+                         
+                            System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
+                            if ((float)a.TotalHours > time)
                             {
                                 return false;
                             }
                         }
                         else
                         {
-                            int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            if (a > time)
+                            System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                            if ((float)a.TotalHours > time)
                             {
                                 return false;
                             }
@@ -2665,8 +2684,8 @@ question, int page = 1, int limit = 10)
                 }
                 else if (time1 != "")
                 {
-                    int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    if (a > time)
+                    System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                    if ((float)a.TotalHours > time)
                     {
                         return false;
                     }
@@ -3113,7 +3132,7 @@ question, int page = 1, int limit = 10)
                                                 x = z;
                                                 timeover = itemList[z].F_CreateTime.ToString();
                                                 //   limit = int.Parse(itemList[z].F_LimitTime);
-                                                continue;
+                                                break; ;
                                             }
                                         }
                                     }
@@ -3292,6 +3311,7 @@ question, int page = 1, int limit = 10)
                                         string timeover = "", timeover2 = ""; int x = 0, y = 0;
                                         var itemList = itembll.GetModelList("  F_WoID=" + it.F_ID + " order by F_ID desc");
                                         if (itemList[0].F_NextDept > 0)
+
                                         {
                                             var deptmodel = departmentBLL.GetModel(int.Parse(itemList[0].F_NextDept.ToString()));
                                             if (deptmodel != null)
@@ -3299,6 +3319,17 @@ question, int page = 1, int limit = 10)
                                                 worker.F_Responsibility = deptmodel.F_DeptName;
                                             }
                                         }
+                                        else
+                                        {
+                                            if (itemList[0].F_WoState ==10)
+                                            {
+                                                var deptmodel = departmentBLL.GetModel(2);
+                                                if (deptmodel != null)
+                                                {
+                                                    worker.F_Responsibility = deptmodel.F_DeptName;
+                                                }
+                                            }
+                                        }
                                         int limit = it.F_limit;
                                         if (itemList != null)
                                         {
@@ -3319,7 +3350,7 @@ question, int page = 1, int limit = 10)
                                             {
                                                 if (itemList[z].F_WoState >= 1)
                                                 {
-                                                    if (itemList[z].F_WoState == 10)
+                                                    if (itemList[z].F_WoState == 11)
                                                     {
                                                         y = z;
                                                         timeover2 = itemList[z].F_CreateTime.ToString();
@@ -4068,15 +4099,23 @@ question, int page = 1, int limit = 10)
            
             if (itemlasts.Count > 0)
             {
-                for (int i = 0; i < itemlasts.Count; i++)
+                for (int z = 0; z < itemlasts.Count; z++)
                 {
-                    if (itemlasts[i].F_WoState >= 1)
+                    if (itemlasts[z].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 1)
+                        if (itemlasts[z].F_WoState == 1)
                         {
-                            x = i;
-                            time1 = itemlasts[i].F_CreateTime.ToString();
+                            x = z;
+                            time1 = itemlasts[z].F_CreateTime.ToString();
+                            break;
                         }
+                    }
+                }
+                for (int i = 0; i < itemlasts.Count; i++)
+                {
+                    if (itemlasts[i].F_WoState >= 1)
+                    {
+                       
                         if (itemlasts[i].F_WoState == 10)
                         {
                             y = i;
@@ -4090,14 +4129,14 @@ question, int page = 1, int limit = 10)
                     {
                         if (x > y)
                         {
-                            float a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            float b = time - a;
+                            System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
+                            float b = time - (float)a.TotalHours;
                             return b;
                         }
                         else
                         {
-                            float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            float b = time - a;
+                            System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                            float b = time - (float)a.TotalHours;
                             return b;
                         }
                     }
@@ -4108,8 +4147,8 @@ question, int page = 1, int limit = 10)
                 }
                 else if (time1 != "")
                 {
-                    float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    float b = time - a;
+                    System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                    float b = time - (float)a.TotalHours;
                     return b;
                 }
                 else

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

@@ -680,7 +680,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         case 4://待完成的(待处理)
                             if (GetDWCWorkOrderID(ua.F_UserCode) != null)
                             {
-                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.reassign + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                                sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback  + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
 
                             }
                             else
@@ -793,8 +793,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) != "")
                             {
 
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
-                           GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
+                                sql += $" and F_State in(" + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                          GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
 
                             }
                             else
@@ -1158,8 +1158,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 // string deptuser = "select F_WoID from T_Sys_UserAccount where F_DeptId=" + deptid;
                 str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                     + " and isnull(F_IsUsed,'0')='0' " + " and "
-                        + "(F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.reback + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
-                        + " or (F_WoState =" + (int)EnumWorkOrderState.receive + " and F_NextUser in('" + deptuser + "'))";//退回下一步操作人
+                        + "(F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback  + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
+                        + " or (F_WoState =" + (int)EnumWorkOrderState.assign + " and F_NextUser in('" + deptuser + "'))";//退回下一步操作人
 
 
             }
@@ -1511,7 +1511,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         deptmodelsname = deptmodels.F_DeptName + "-";
                     }
-                    var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_CreateUser!=" + user.F_UserCode + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                    var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_CreateUser!=" + user.F_UserCode + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                     if (itemlast != null)
                         toussers = itemlast.F_CreateUser;
                     wostate = 16;
@@ -1544,7 +1544,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
                     if (ro.F_RoleCode == "DQJL")
                     {
-                        var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                        var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                         if (itemlast != null)
                             toussers = itemlast.F_CreateUser;
                         if (AuditState == 0)
@@ -1810,6 +1810,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
             foreach (var it in itemlast)
             {
                 float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
+                int overtime = 0;
+                if (!string .IsNullOrEmpty (it.F_LimitTime))
+                {
+                 overtime = int.Parse(it.F_LimitTime);
+                }
+                int sms = int.Parse (it.F_IsSMS.ToString ());
                 if (F_RoleCode == "DQJL")
                 {
                     if (hours >= 24)
@@ -1841,8 +1847,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
                         Model.T_Wo_WorkOrder model = woBLL.GetModel(it.F_WoID);
-                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, 0, 0);
+                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms );
+                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, overtime, sms);
                     }
                     else if (hours >= 48)
                     {
@@ -1863,6 +1869,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                       + "F_WoState in(" + (int)EnumWorkOrderState.audit + ") and F_NextUser in ( " + GetDeptment(ua) + ") ");
                     foreach (var it in itemlasts)
                     {
+                        int overtime = 0;
+                        if (!string.IsNullOrEmpty(it.F_LimitTime))
+                        {
+                            overtime = int.Parse(it.F_LimitTime);
+                        }
+                        int sms = int.Parse(it.F_IsSMS.ToString());
                         float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
                         if (F_RoleCode == "DQJL")
                         {
@@ -1884,8 +1896,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptmodelsname = deptmodels.F_DeptName + "-";
                                 }
-                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, 0, 0);
-                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, 0, 0);
+                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, overtime, sms);
+                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, overtime, sms );
                                 if (hours < 48)
                                 {
                                     str = GetID(str, it.F_WoID);
@@ -2263,10 +2275,10 @@ 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 = 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)));
                     if (ua != null)
                     {
-                        var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_CreateTime desc").FirstOrDefault();
+                        var itemlast = itembll.GetModelList("   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
                         if (itemlast != null)
                             model.F_UserCode = itemlast.F_CreateUser;
                         if (!string.IsNullOrEmpty(model.F_UserCode))
@@ -2321,17 +2333,24 @@ namespace CallCenterApi.Interface.Controllers.weixin
             string time1 = "", time2 = ""; int x = 0, y = 0;
             if (itemlasts.Count > 0)
             {
-                for (int i = 0; i < itemlasts.Count; i++)
+                for (int z = 0; z < itemlasts.Count; z++)
                 {
-                    if (itemlasts[i].F_WoState >= 1)
+                    if (itemlasts[z].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 1)
+                        if (itemlasts[z].F_WoState == 1)
                         {
-                            x = i;
-                            time1 = itemlasts[i].F_CreateTime.ToString();
-
+                            x = z;
+                            time1 = itemlasts[z].F_CreateTime.ToString();
+                            break;
                         }
-                        if (itemlasts[i].F_WoState == 10)
+                    }
+                }
+                for (int i = 0; i < itemlasts.Count; i++)
+                {
+                    if (itemlasts[i].F_WoState >= 1)
+                    {
+                      
+                        if (itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -2344,14 +2363,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (x > y)
                         {
-                            float a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            float b = limit - a;
+                            System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
+                            float b = limit - (float)a.TotalHours;
                             return b;
                         }
                         else
                         {
-                            float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            float b = limit - a;
+                            System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                            float b = limit - (float)a.TotalHours;
                             return b;
                         }
                     }
@@ -2362,8 +2381,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 else if (time1 != "")
                 {
-                    float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    float b = limit - a;
+                    System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                    float b = limit - (float)a.TotalHours;
                     return b;
                 }
                 else
@@ -2414,7 +2433,18 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (deptmodel.F_Layer == 2)
                             {
                                 Model.T_Sys_UserAccount userModel = userAccountBLL.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();
+                             if (userModel!=null )
                                 return userModel;
+                             else
+                                {
+                                    var dept = departmentBLL.GetModel(deptmodel.F_ParentId);
+                                    if (dept != null)
+                                    {
+                                        Model.T_Sys_UserAccount userModel1 = userAccountBLL.GetModelList(" F_DeptId=" + dept.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                                        return userModel1;
+                                    }
+                                }
+
                             }
                             if (deptmodel.F_Layer == 1)
                             {
@@ -2445,7 +2475,9 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (dept != null)
                             {
                                 Model.T_Sys_UserAccount userModel = userAccountBLL.GetModelList(" F_DeptId=" + dept.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                                if (userModel!=null )
                                 return userModel;
+                               
                             }
                             else
                             {
@@ -3012,6 +3044,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     model.F_State = (int)EnumWorkOrderState.audit;
                 }
+                model.F_limit = overtime;
+               
                 #endregion
                 long n = woBLL.Add(model);
                 if (n > 0)
@@ -3036,8 +3070,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                 }
-                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, user.F_UserCode, user.F_DeptId, ua, overtime, sms );
+                                AddLog(modlelist.F_ID, modlelist.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
                             }
                             else
                             {
@@ -3050,7 +3084,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     deptname1 = deptmodel1.F_DeptName + "-";
                                     dapt = deptmodel1.F_ParentId;
                                 }
-                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, 0, 0);
+                                AddLog(modlelist.F_ID, 0, deptname1 + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                                 string opt = "";
                                 if (dapt != 0)
                                 {
@@ -3092,7 +3126,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         else
                         {
-                            AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, 0, 0);
+                            AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
                             return Success("添加成功");
                         }
 
@@ -3627,22 +3661,30 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         private bool TimeforOver(int id)
         {
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
+            var itemlasts = itembll.GetModelList("  F_WoID=" + id + " order by F_ID desc");
             string time1 = "", time2 = ""; int x = 0, y = 0;
             float time = 0;
             if (itemlasts.Count > 0)
             {
-                for (int i = 0; i < itemlasts.Count; i++)
+                for (int z = 0; z < itemlasts.Count; z++)
                 {
-                    if (itemlasts[i].F_WoState >= 1)
+                    if (itemlasts[z].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 1)
+                        if (itemlasts[z].F_WoState == 1)
                         {
-                            x = i;
-                            time1 = itemlasts[i].F_CreateTime.ToString();
-                            time = float.Parse(itemlasts[i].F_LimitTime);
+                            x = z;
+                            time1 = itemlasts[z].F_CreateTime.ToString();
+                            time = float.Parse(itemlasts[z].F_LimitTime);
+                            break; ;
                         }
-                        if (itemlasts[i].F_WoState == 10)
+                    }
+                }
+                for (int i = 0; i < itemlasts.Count; i++)
+                {
+                    if (itemlasts[i].F_WoState >= 1)
+                    {
+                      
+                        if (itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -3655,16 +3697,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (x > y)
                         {
-                            int a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            if (a > time)
+                            System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
+                            if ((float)a.TotalHours > time)
                             {
                                 return false;
                             }
                         }
                         else
                         {
-                            int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            if (a > time)
+                            System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                            if ((float)a.TotalHours > time)
                             {
                                 return false;
                             }
@@ -3677,8 +3719,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 else if (time1 != "")
                 {
-                    int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    if (a > time)
+                    System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                    if ((float)a.TotalHours > time)
                     {
                         return false;
                     }
@@ -3752,10 +3794,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         var itemlast = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + ua.F_UserCode + "'" + "and F_IsUsed=2  and  F_WoID = " + orderid);
+                        int overtime = 0, sms = 0;
                         if (itemlast.Count > 0)
                         {
                             foreach (var it in itemlast)
                             {
+                                if (!string .IsNullOrEmpty (it.F_LimitTime))
+                                    overtime = int.Parse(it.F_LimitTime);
+                                sms = int .Parse (it.F_IsSMS.ToString ());
+
                                 it.F_IsUsed = 1;
                                 itembll.Update(it);
                             }
@@ -3767,7 +3814,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批", (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "", 1);
+                        AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批", (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, overtime, sms, "", 1);
                         bool n = woBLL.Update(model);
                         if (n)
                             return Success("审批成功");
@@ -3828,7 +3875,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     sendwxmsg(model, createUser.F_WxOpenId, nowUser, "接单");
                 #endregion
                 #region 读取上一级指派人员推送系统消息和微信消息
-                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                 if (itemlast != null)
                 {
                     if (itemlast.F_CreateUser != model.F_CreateBy)
@@ -3951,7 +3998,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         {
             int type = 0;
             var modlelist = woBLL.GetModelList(" F_IsDelete=0" + "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," +
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")");
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish + ")");
             if (modlelist.Count > 0)
             {
                 foreach (var it in modlelist)
@@ -4073,7 +4120,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单，延期说明：" + cont;
             //获取上一级处理人员
             var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by order  F_ID  desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.Delay, optbut, touser, 0, nowUser, limit + model.F_limit, sms, "", 1);
@@ -4122,7 +4169,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单，退回说明：" + cont;
             //获取上一级处理人员
             var touser = ""; var deptid = 0;
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
             {
 
@@ -4245,7 +4292,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 #endregion
                 #region 向上一级操作人员推送消息
-                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                 if (itemlast != null)
                 {
                     if (itemlast.F_CreateUser != model.F_CreateBy)
@@ -4324,9 +4371,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// </summary>
         /// <returns></returns>
         [WechatActionFilter]
-        public ActionResult Update(WorkOrderNewInput input)
+        public ActionResult Update(WorkOrderNewInput input )
         {
             var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + input.F_WxOpenId + "'").FirstOrDefault();
+          
             if (ua != null)
             {
                 #region 添加验证判断
@@ -4381,6 +4429,14 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 {
                     return Error("此工单已处理不能修改！");
                 }
+                var itemlasts = itembll.GetModelList("    F_WoID=" + model.F_ID + "order by F_ID desc ").FirstOrDefault ();
+                int overtime = 0, sms = 0;
+                if (itemlasts!=null )
+                {
+                    if (itemlasts.F_LimitTime != "")
+                        overtime = int.Parse(itemlasts.F_LimitTime);
+                    sms = int.Parse(itemlasts.F_IsSMS.ToString());
+                }
                 #region 保存客户基本信息
                 model = inputtoobj(ua, model, input, 1);
                 #endregion
@@ -4397,7 +4453,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     #endregion
 
-                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua, 0, 0);
+                    AddLog(input.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "修改工单", (int)EnumItemType.update, (int)EnumItemOpt.update, "", 0, ua, overtime, sms);
                     if (GetUser(input.F_WxOpenId) != null)
                     {
                         var user = GetUser(input.F_WxOpenId);
@@ -4409,7 +4465,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         var deptmodel1 = departmentBLL.GetModel(ua.F_DeptId);
 
-                        AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
+                        AddLog(input.F_ID, model.F_State.Value, deptname1 + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
                     }
                     else
                     {
@@ -4447,7 +4503,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         }
                         if (nextda != 0)
                         {
-                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0);
+                            var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms );
                             if (res)
                                 return Success("保存成功");
                             else

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

@@ -175,7 +175,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                              if (GetDeptWorkOrderID(ua.F_DeptId,ua .F_UserCode  ) != "")
                         {
                           
-                                sql += $" and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
+                                sql += $" and F_State in("     + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.assign + ")  and T_Wo_WorkOrder.F_ID in ( " +
                            GetDeptWorkOrderID(ua.F_DeptId, ua.F_UserCode) + ") "; ;
                             
                         }
@@ -189,7 +189,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     case 2://待完成的(待处理)
                         if(GetDWCWorkOrderID(ua.F_UserCode)!=null )
                         {
-                            sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.reassign + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
+                            sql += " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + (int)EnumWorkOrderState.reback + ") and T_Wo_WorkOrder.F_ID in ( " + GetDWCWorkOrderID(ua.F_UserCode) + ") ";
                         }
                         else
                         {
@@ -1232,7 +1232,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         deptmodelsname = deptmodels.F_DeptName + "-";
                     }
-                    var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_CreateUser!=" + user.F_UserCode  + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                    var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit + " and  F_CreateUser!=" + user.F_UserCode  + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                     if (itemlast != null)
                         toussers = itemlast.F_CreateUser;
                     wostate = 16;
@@ -1265,7 +1265,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
                     if (ro.F_RoleCode == "DQJL")
                     {
-                        var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit  + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                        var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.audit  + " and  F_OptType=" + (int)EnumItemOpt.audit + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                         if (itemlast != null)
                             toussers = itemlast.F_CreateUser;
 
@@ -1458,6 +1458,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
             foreach (var it in itemlast)
             {
                 float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
+                int overtime = 0;
+                if (!string.IsNullOrEmpty(it.F_LimitTime))
+                {
+                    overtime = int.Parse(it.F_LimitTime);
+                }
+                int sms = int.Parse(it.F_IsSMS.ToString());
                 if (F_RoleCode == "DQJL")
                 {
                     if (hours >= 24)
@@ -1489,8 +1495,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         DateTime time = DateTime.Parse(it.F_CreateTime.ToString()).AddHours(24);
                         Model.T_Wo_WorkOrder model = workOrder .GetModel(it.F_WoID);
-                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, 0, 0);
-                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, 0, 0);
+                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, ua, overtime, sms);
+                        AddLog(model.F_ID, model.F_State.Value, deptname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, user.F_UserCode, user.F_DeptId, user, overtime, sms);
                     }
                     else if (hours >= 48)
                     {
@@ -1512,6 +1518,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     foreach (var it in itemlasts)
                     {
                         float hours = (DateTime.Now - DateTime.Parse(it.F_CreateTime.ToString())).Hours;
+                        int overtime = 0;
+                        if (!string.IsNullOrEmpty(it.F_LimitTime))
+                        {
+                            overtime = int.Parse(it.F_LimitTime);
+                        }
+                        int sms = int.Parse(it.F_IsSMS.ToString());
                         if (F_RoleCode == "DQJL")
                         {
                             if (hours >= 24)
@@ -1532,8 +1544,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 {
                                     deptmodelsname = deptmodels.F_DeptName + "-";
                                 }
-                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, 0, 0);
-                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, 0, 0);
+                                AddLog(model.F_ID, model.F_State.Value, deptmodelsname + user.F_UserName + "(" + user.F_WorkNumber + ")" + "未审批流转大区经理", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, user, overtime, sms);
+                                AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, ua.F_UserCode, ua.F_DeptId, ua, overtime, sms);
                                 if (hours < 48)
                                 {
                                     str = GetID(str, it.F_WoID);
@@ -1720,7 +1732,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期审批："+ opt + cont;
             //获取上一级处理人员
             var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, limit, sms,"",1);
@@ -2193,8 +2205,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 // string deptuser = "select F_WoID from T_Sys_UserAccount where F_DeptId=" + deptid;
                 str = "select F_WoID from T_Wo_WorkOrderItem_New where F_ItemType=" + (int)EnumItemType.deal
                     + " and isnull(F_IsUsed,'0')='0' " + " and "
-                        + "(F_WoState in(" + (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.reback + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
-                        + " or (F_WoState =" + (int)EnumWorkOrderState.receive + " and F_NextUser in('" + deptuser + "'))";//退回下一步操作人
+                        + "(F_WoState in(" + (int)EnumWorkOrderState.assign + ","  + (int)EnumWorkOrderState.abreback + ") and F_NextDept =" + deptid + ") "//办理中和接单状态的操作人
+                        + " or (F_WoState =" + (int)EnumWorkOrderState.abreback + " and F_NextUser in('" + deptuser + "'))";//
                    
 
             }
@@ -3350,7 +3362,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
             int type = 0;
             var modlelist = workOrder .GetModelList(" F_IsDelete=0"+ "and F_IsOver=0" + " and F_State in(" + (int)EnumWorkOrderState.dealing + "," + (int)EnumWorkOrderState.receive + "," + 
-                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + ")");
+                (int)EnumWorkOrderState.assign + "," + (int)EnumWorkOrderState.reback + "," + (int)EnumWorkOrderState.abreback + "," + (int)EnumWorkOrderState.finish  + ")");
             if (modlelist.Count >0)
             {
                 foreach (var it in modlelist )
@@ -3528,7 +3540,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (deptmodel.F_Layer == 2)
                         {
                             Model.T_Sys_UserAccount userModel = sysUserAccountBll .GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();
-                            return userModel;
+                            if (userModel != null)
+                                return userModel;
+                            else
+                            {
+                                var dept = departmentBLL.GetModel(deptmodel.F_ParentId);
+                                if (dept != null)
+                                {
+                                    Model.T_Sys_UserAccount userModel1 = sysUserAccountBll.GetModelList(" F_DeptId=" + dept.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                                    return userModel1;
+                                }
+                            }
                         }
                         if (deptmodel.F_Layer == 1)
                         {
@@ -4390,7 +4412,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_IsVisit ="否";//
                     }
-                    model.RemainingTime = 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)) );
                     model.F_VisitOn = model1[i].F_VisitOn;//回访时间
                     model.F_VisitBy = model1[i].F_VisitBy;//回访人
                     model.F_VisitResult = model1[i].F_VisitResult;//回访结果：非常满意、满意、一般、不满意
@@ -4446,7 +4469,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (ua !=null )
                     {
-                        var itemlast = itembll.GetModelList( "   F_WoID='" + model.F_ID +  "' order by F_CreateTime desc").FirstOrDefault();
+                        var itemlast = itembll.GetModelList( "   F_WoID='" + model.F_ID + "' order by F_ID desc").FirstOrDefault();
                         if (itemlast != null)
                             model.F_UserCode = itemlast.F_CreateUser;
                         if (!string.IsNullOrEmpty(model.F_UserCode))
@@ -4543,17 +4566,23 @@ namespace CallCenterApi.Interface.Controllers.workorder
             string time1 = "", time2 = ""; int x = 0, y = 0;
             if (itemlasts.Count > 0)
             {
-                for (int i = 0; i < itemlasts.Count; i++)
+                for (int z = 0; z < itemlasts.Count; z++)
                 {
-                    if (itemlasts[i].F_WoState >= 1)
+                    if (itemlasts[z].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 1)
+                        if (itemlasts[z].F_WoState == 1)
                         {
-                            x = i;
-                            time1 = itemlasts[i].F_CreateTime.ToString();
-
+                            x = z;
+                            time1 = itemlasts[z].F_CreateTime.ToString();
+                            break ;
                         }
-                        if (itemlasts[i].F_WoState == 10)
+                    }
+                }
+                for (int i = 0; i < itemlasts.Count; i++)
+                {
+                    if (itemlasts[i].F_WoState >= 1)
+                    {
+                        if (itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -4566,14 +4595,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (x > y)
                         {
-                            float a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            float b = limit - a;
+                            System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
+                            float b = limit - (float)a.TotalHours;
                             return b;
                         }
                         else
                         {
-                            float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            float b = limit - a;
+                            System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                            float b = limit - (float)a.TotalHours;
                             return b;
                         }
                     }
@@ -4584,8 +4613,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else if (time1 != "")
                 {
-                    float a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    float b = limit - a;
+                    System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                    float b = limit -(float ) a.TotalHours ;
                     return b;
                 }
                 else
@@ -4606,22 +4635,31 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         private bool  TimeforOver(int id)
         {
-            var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
+            var itemlasts = itembll.GetModelList("  F_WoID=" + id + " order by F_ID desc");
+           // var itemlasts = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID=" + id + " ");
             string  time1="", time2="" ;int x=0, y=0;
             float  time = 0;
             if (itemlasts.Count > 0)
             {
-                for (int i=0;i < itemlasts.Count;i++)
+                for (int z = 0; z < itemlasts.Count; z++)
                 {
-                    if (itemlasts[i ].F_WoState >= 1)
+                    if (itemlasts[z].F_WoState >= 1)
                     {
-                        if (itemlasts[i].F_WoState == 1)
+                        if (itemlasts[z].F_WoState == 1)
                         {
-                            x = i;
-                            time1 = itemlasts[i].F_CreateTime.ToString();
-                            time = float .Parse(itemlasts[i].F_LimitTime);
+                            x = z;
+                            time1 = itemlasts[z].F_CreateTime.ToString();
+                            time = float.Parse(itemlasts[z].F_LimitTime);
+                            break; ;
                         }
-                        if (itemlasts[i].F_WoState == 10)
+                    }
+                }
+              
+                for (int i=0;i < itemlasts.Count;i++)
+                {
+                    if (itemlasts[i ].F_WoState >= 1)
+                    {
+                        if (itemlasts[i].F_WoState == 11)
                         {
                             y = i;
                             time2 = itemlasts[i].F_CreateTime.ToString();
@@ -4634,16 +4672,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (x > y)
                         {
-                            int a = (DateTime.Parse(time2) - DateTime.Parse(time1)).Hours;
-                            if (a > time)
+                            System.TimeSpan a = DateTime.Parse(time2) - DateTime.Parse(time1);
+                           
+                           
+                            if ((float)a.TotalHours > time)
                             {
                                 return false;
                             }
                         }
                         else
                         {
-                            int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                            if (a > time)
+                            System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                            if ((float)a.TotalHours > time)
                             {
                                 return false;
                             }
@@ -4656,8 +4696,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else if (time1 != "")
                 {
-                    int a = (DateTime.Now - DateTime.Parse(time1)).Hours;
-                    if (a > time)
+                    System.TimeSpan a = DateTime.Now - DateTime.Parse(time1);
+                    if ((float)a.TotalHours > time)
                     {
                         return false;
                     }
@@ -5872,7 +5912,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         public bool RemindWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont)
         {
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_IsUsed=0 order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_IsUsed=0 order by F_ID desc").FirstOrDefault();
             #region 接收人
             int todept = 0; string touser = "";
             if (itemlast != null)
@@ -5949,7 +5989,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + "延期工单，延期说明：" + cont;
             //获取上一级处理人员
             var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
             
@@ -6002,7 +6042,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
 
             var touser = ""; var deptid=0;
 
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID  + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_NextDept =" + nowUser.F_DeptId + " and F_WoState =" + F_OptType + " and  F_WoID='" + model.F_ID  + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
             {
                 touser = itemlast.F_CreateUser;
@@ -6093,7 +6133,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单:回访结果：" + cont+" , " + "工单:呼叫结果：" + call;
            
             var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model .F_limit , sms);
@@ -6164,7 +6204,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "完结工单";
 
             var touser = "";
-            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+            var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
             var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
@@ -6269,7 +6309,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 #endregion
                 #region 向上一级操作人员推送消息
-                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                 if (itemlast!=null )
                 {
                     if (itemlast.F_CreateUser != model.F_CreateBy)
@@ -6351,7 +6391,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sendwxmsg(model, createUser.F_WxOpenId, nowUser, "接单");
                 #endregion
                 #region 读取上一级指派人员推送系统消息和微信消息
-                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_CreateTime desc").FirstOrDefault();
+                var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and  F_WoID='" + model.F_ID  + "' and F_NextUser='" + nowUser.F_UserCode + "' order by F_ID desc").FirstOrDefault();
                 if (itemlast!=null )
                 {
                     if (itemlast.F_CreateUser != model.F_CreateBy)

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Enum/EnumWorkOrderState.cs

@@ -19,7 +19,7 @@ namespace CallCenterApi.Interface.Models.Enum
         receive,
         [Description("已退回待处理")]
         reback,
-        [Description("异常退回待处理")]
+        [Description("异常退回待接单")]
         abreback,
         [Description("处理中")]
         dealing,