工单流转更新

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/App_Start/AuthorizeAttribute.cs

@@ -28,24 +28,33 @@ namespace CallCenterApi.Interface
                 var controller = controllerDescriptor.ControllerName;
                 var action = actionDescriptor.ActionName;
                 var token = filterContext.HttpContext.Request["token"];
-
-                var userData = CacheHelper.Get<Cache.Models.CurrentUserInfo>(token);
-                var roleId = userData.F_RoleId;
-                var role = new BLL.T_Sys_RoleInfo().GetModel(roleId);
-                if (role != null)
+                if (token != null)
                 {
-                    var roleFunctionList = roleFunctionBLL.DataTableToList(roleFunctionBLL.GetList(" F_RoleId=" + role.F_RoleId).Tables[0]);
-                    //var str = string.Join(",", roleFunctionList.Select(x => x.F_FunctionId).ToArray());
-                    var moduleFunction = new BLL.T_Sys_ModuleFunctions().GetModel(controller, action);
-                    if (moduleFunction != null)
+                    var userData = CacheHelper.Get<Cache.Models.CurrentUserInfo>(token);
+                    var roleId = userData.F_RoleId;
+                    var role = new BLL.T_Sys_RoleInfo().GetModel(roleId);
+                    if (role != null)
                     {
-                        var single = roleFunctionList.SingleOrDefault(x => x.F_FunctionId == moduleFunction.F_FunctionId);
-                        if (single != null)
+                        var roleFunctionList = roleFunctionBLL.DataTableToList(roleFunctionBLL.GetList(" F_RoleId=" + role.F_RoleId).Tables[0]);
+                        //var str = string.Join(",", roleFunctionList.Select(x => x.F_FunctionId).ToArray());
+                        var moduleFunction = new BLL.T_Sys_ModuleFunctions().GetModel(controller, action);
+                        if (moduleFunction != null)
                         {
-                            isAuth = true;
+                            var single = roleFunctionList.SingleOrDefault(x => x.F_FunctionId == moduleFunction.F_FunctionId);
+                            if (single != null)
+                            {
+                                isAuth = true;
+                            }
                         }
                     }
                 }
+                else
+                {
+                    filterContext.HttpContext.Response.StatusCode = 200;
+                    filterContext.Result = new ContentResult { Content = new AjaxResult { state = ResultTypes.notoken.ToString(), message = "未传入token，请重新登录。" }.ToJson() };
+                    WriteLog(filterContext);
+                    return;
+                }
             }
             else
             {

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Base/BaseController.cs

@@ -14,7 +14,14 @@ namespace CallCenterApi.Interface.Controllers.Base
         {
             get
             {
-                return (FormsPrincipal<Cache.Models.CurrentUserInfo>)base.User;
+                try
+                {
+                    return (FormsPrincipal<Cache.Models.CurrentUserInfo>)base.User;
+                }
+                catch
+                {
+                    return null;
+                }
             }
         }
         /// <summary>

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

@@ -2081,7 +2081,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 else
                 {
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
-                    if (ro.F_RoleCode == "DQJL")
+                    if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL")
                     {
                         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)
@@ -2216,50 +2216,49 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 deptname = deptmodel1.F_DeptName;
             }
             int isbl = 0;
-            if (dapt != 0)
-            {
-                if (dapt == 11)
+            Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+            //if (dapt != 0)
+            //{
+                if (CirculMarket(ua.F_DeptId, 11))
                 {
                     isbl = 1;
                     nextda = 37;
                     opt = "流转市场管理科";
                 }
-                else if (dapt == 14)
+                else if (CirculMarket(ua.F_DeptId, 14))
                 {
                     isbl = 1;
                     nextda = 57;
                     opt = "流转营销管理处";
                 }
-                else if (dapt == 15)
+                else if (CirculMarket(ua.F_DeptId, 15))
                 {
                     isbl = 1;
                     nextda = 74;
                     opt = "流转策划推广";
                 }
-                else if (dapt == 16)
+                else if (CirculMarket(ua.F_DeptId, 16))
                 {
                     isbl = 1;
                     nextda = 88;
                     opt = "流转销售部";
                 }
-                else if (dapt == 18)
+                else if (CirculMarket(ua.F_DeptId, 18))
                 {
                     nextda = 268;
                     opt = "流转车用尿素";
 
                 }
-
-                else if (dapt == 20)
+                else if (CirculMarket(ua.F_DeptId, 20))
                 {
                     nextda = 295;
                     opt = "流转新乡黑科质检";
                 }
-                else if (dapt == 332)
+                else if (CirculMarket(ua.F_DeptId, 332))
                 {
                     nextda = 339;
                     opt = "流转营销管理处";
 
-
                 }
                 else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                 {
@@ -2268,14 +2267,23 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     opt = "流转" + deptname;
                 }
 
-            }
+            //}
             if (istrue)
             {
-                cont = "大区经理已审批:" + AuditCont + "," + opt;
+                if (ro.F_RoleCode == "DQJL")
+                {
+                    cont = "大区经理已审批:" + AuditCont + "," + opt;
+                }
+                else cont = "分公司经理已审批:" + AuditCont + "," + opt;
             }
             else
             {
-                cont = "大区经理未审批" + opt;
+                if (ro.F_RoleCode == "DQJL")
+                {
+                    cont = "大区经理未审批" + opt;
+                }
+                else
+                    cont = "分公司经理未审批" + opt;
             }
             if (nextda != 0)
             {
@@ -2287,6 +2295,24 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 return false;
             }
         }
+
+        /// <summary>
+        /// 判断市场管理科
+        /// </summary>
+        /// <param name="deptid"></param>
+        /// <param name="pdeptid"></param>
+        /// <returns></returns>
+        public bool CirculMarket(int deptid, int pdeptid)
+        {
+            string sql = " F_State=1 ";
+            string dptcode = departmentBLL.GetModel(pdeptid).F_DeptCode;
+            string arrsql = " select F_DeptCode from T_Sys_Department where F_DeptCode LIKE '" + dptcode + "%' ";
+            sql += $" and F_DeptCode in ({arrsql}) and F_DeptId=" + deptid;
+            var modellist = departmentBLL.GetModelList(sql);
+            if (modellist.Count > 0)
+                return true;
+            else return false;
+        }
         /// <summary>
         /// 查询工单详情
         /// </summary>
@@ -2471,7 +2497,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                  overtime = int.Parse(it.F_LimitTime);
                 }
                 int sms = int.Parse (it.F_IsSMS.ToString ());
-                if (F_RoleCode == "DQJL")
+                if (F_RoleCode == "DQJL" || F_RoleCode == "FGSJL")
                 {
                     if (hours >= 24)
                     {
@@ -2485,28 +2511,52 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 }
                 else
                 {
-                    var user = GetUser(OpenId);
-                    string deptname = "";
-                    string deptmodelsname = "";
-                    var deptmodel = departmentBLL.GetModel(user.F_DeptId);
-                    var deptmodels = departmentBLL.GetModel(ua.F_DeptId);
-                    if (deptmodel != null)
-                    {
-                        deptname = deptmodel.F_DeptName + "-";
-                    }
-                    if (deptmodels != null)
-                    {
-                        deptmodelsname = deptmodels.F_DeptName + "-";
-                    }
+                    //var user = GetUser(OpenId);
+                    //string deptname = "";
+                    //string deptmodelsname = "";
+                    //var deptmodel = departmentBLL.GetModel(user.F_DeptId);
+                    //var deptmodels = departmentBLL.GetModel(ua.F_DeptId);
+                    //if (deptmodel != null)
+                    //{
+                    //    deptname = deptmodel.F_DeptName + "-";
+                    //}
+                    //if (deptmodels != null)
+                    //{
+                    //    deptmodelsname = deptmodels.F_DeptName + "-";
+                    //}
                     if (hours >= 24)
                     {
+                        var user = GetUser(OpenId);
+                        string deptname = "";
+                        string deptmodelsname = "";
+                        string namestr = "";
+                        Model.T_Sys_RoleInfo ro = rolebll.GetModel(user.F_RoleId);
+                        if (ro.F_RoleCode == "DQJL")
+                        {
+                            namestr = "大区经理";
+                        }
+                        else
+                        {
+                            namestr = "分公司经理";
+                        }
+                        var deptmodel = departmentBLL.GetModel(user.F_DeptId);
+                        var deptmodels = departmentBLL.GetModel(ua.F_DeptId);
+                        if (deptmodel != null)
+                        {
+                            deptname = deptmodel.F_DeptName + "-";
+                        }
+                        if (deptmodels != null)
+                        {
+                            deptmodelsname = deptmodels.F_DeptName + "-";
+                        }
                         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, overtime, sms );
+                        AddLog(model.F_ID, model.F_State.Value, deptmodelsname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "未审批流转"+ namestr + "", (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)
                     {
+                        var user = GetUser(OpenId);
                         GetDaQucirCulation("", user, it.F_CreateTime.ToString(), it.F_WoID, false);
                     }
                     else
@@ -3140,27 +3190,35 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (deptmodel != null)
                         {
-                            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 )
+                            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)
+                            else
                             {
-                                Model.T_Sys_UserAccount userModel = userAccountBLL.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
-                                return userModel;
+                                Model.T_Sys_UserAccount userModel1 = userAccountBLL.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                                return userModel1;
                             }
+                            //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)
+                            //{
+                            //    Model.T_Sys_UserAccount userModel = userAccountBLL.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                            //    return userModel;
+                            //}
                         }
                         else
                         {
@@ -4026,53 +4084,53 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 }
                                 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)
+                                //if (dapt != 0)
+                                //{
+                                if (CirculMarket(ua.F_DeptId, 11))
                                 {
-                                    if (dapt == 11)
-                                    {
-                                        nextda = 37;
-                                        opt = "流转市场管理科";
-                                    }
-                                    else if (dapt == 14)
-                                    {
-                                        nextda = 57;
-                                        opt = "流转营销管理处";
-                                    }
-                                    else if (dapt == 15)
-                                    {
-                                        nextda = 74;
-                                        opt = "流转策划推广";
-                                    }
-                                    else if (dapt == 16)
-                                    {
-                                        nextda = 88;
-                                        opt = "流转销售部";
-                                    }
-                                    else if (dapt == 18)
-                                    {
-                                        nextda = 268;
-                                        opt = "流转车用尿素";
+                                    nextda = 37;
+                                    opt = "流转市场管理科";
+                                }
+                                else if (CirculMarket(ua.F_DeptId, 14))
+                                {
+                                    nextda = 57;
+                                    opt = "流转营销管理处";
+                                }
+                                else if (CirculMarket(ua.F_DeptId, 15))
+                                {
+                                    nextda = 74;
+                                    opt = "流转策划推广";
+                                }
+                                else if (CirculMarket(ua.F_DeptId, 16))
+                                {
+                                    nextda = 88;
+                                    opt = "流转销售部";
+                                }
+                                else if (CirculMarket(ua.F_DeptId, 18))
+                                {
+                                    nextda = 268;
+                                    opt = "流转车用尿素";
 
-                                    }
+                                }
 
-                                    else if (dapt == 20)
-                                    {
-                                        nextda = 295;
-                                        opt = "流转新乡黑科质检";
-                                    }
-                                    else if (dapt == 332)
-                                    {
-                                        nextda = 339;
-                                        opt = "流转营销管理处";
+                                else if (CirculMarket(ua.F_DeptId, 20))
+                                {
+                                    nextda = 295;
+                                    opt = "流转新乡黑科质检";
+                                }
+                                else if (CirculMarket(ua.F_DeptId, 332))
+                                {
+                                    nextda = 339;
+                                    opt = "流转营销管理处";
 
 
-                                    }
-                                    else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
+                                } 
+                                else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                                     {
                                         nextda = ua.F_DeptId;
                                         opt = "流转" + deptment;
                                     }
-                                }
+                                //}
                                 if (nextda != 0)
                                 {
                                     var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, overtime, sms,0,0,0,"",1);
@@ -4086,8 +4144,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     return Error("流转失败！");
                                 }
 
-                            }
                         }
+                    }
                         else
                         {
                             AddLog(modlelist.F_ID, 0, "客户" + "创建工单", (int)EnumItemType.deal, (int)EnumItemOpt.create, "", 0, null, overtime, sms);
@@ -5608,53 +5666,52 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             deptname1 = deptmodel1.F_DeptName ;
                             dapt = deptmodel1.F_ParentId;
                         }
-                        if (dapt != 0)
-                        {
-                            if (dapt == 11)
+                        //if (dapt != 0)
+                        //{
+                            if (CirculMarket(ua.F_DeptId, 11))
                             {
                                 nextda = 37;
                                 opt = "流转市场管理科";
                             }
-                            else if (dapt == 14)
+                            else if (CirculMarket(ua.F_DeptId, 14))
                             {
                                 nextda = 57;
                                 opt = "流转营销管理处";
                             }
-                            else if (dapt == 15)
+                            else if (CirculMarket(ua.F_DeptId, 15))
                             {
                                 nextda = 74;
                                 opt = "流转策划推广";
                             }
-                            else if (dapt == 16)
+                            else if (CirculMarket(ua.F_DeptId, 16))
                             {
                                 nextda = 88;
                                 opt = "流转销售部";
                             }
-                            else if (dapt == 18)
+                            else if (CirculMarket(ua.F_DeptId, 18))
                             {
                                 nextda = 268;
                                 opt = "流转车用尿素";
 
                             }
 
-                            else if (dapt == 20)
+                            else if (CirculMarket(ua.F_DeptId, 20))
                             {
                                 nextda = 295;
                                 opt = "流转新乡黑科质检";
                             }
-                            else if (dapt == 332)
+                            else if (CirculMarket(ua.F_DeptId, 332))
                             {
                                 nextda = 339;
                                 opt = "流转营销管理处";
 
-
                             }
                             else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                             {
                                 nextda = ua.F_DeptId;
                                 opt = "流转" + deptname1;
                             }
-                        }
+                        //}
                         if (nextda != 0)
                         {
                             var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, sms,0,0,0,"",1 );

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

@@ -1319,7 +1319,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 else
                 {
                     Model.T_Sys_RoleInfo ro = rolebll.GetModel(nowUser.F_RoleId);
-                    if (ro.F_RoleCode == "DQJL")
+                    if (ro.F_RoleCode == "DQJL" || ro.F_RoleCode == "FGSJL")
                     {
                         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)
@@ -1473,44 +1473,45 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 deptname = deptmodel1.F_DeptName;
             }
             int isbl = 0;
-            if (dapt != 0)
-            {
-                if (dapt == 11)
+            Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
+            //if (dapt != 0)
+            //{
+            if (CirculMarket(ua.F_DeptId, 11))
                 {
                     isbl = 1;
                     nextda = 37;
                     opt = "流转市场管理科";
                 }
-                else if (dapt == 14)
+                else if (CirculMarket(ua.F_DeptId, 14))
                 {
                     isbl = 1;
                     nextda = 57;
                     opt = "流转营销管理处";
                 }
-                else if (dapt == 15)
+                else if (CirculMarket(ua.F_DeptId, 15))
                 {
                     isbl = 1;
                     nextda = 74;
                     opt = "流转策划推广";
                 }
-                else if (dapt == 16)
+                else if (CirculMarket(ua.F_DeptId, 16))
                 {
                     isbl = 1;
                     nextda = 88;
                     opt = "流转销售部";
                 }
-                else if (dapt == 18)
+                else if (CirculMarket(ua.F_DeptId, 18))
                 {
                     nextda = 268;
                     opt = "流转车用尿素";
 
                 }
-                else if (dapt == 20)
+                else if (CirculMarket(ua.F_DeptId, 20))
                 {
                     nextda = 295;
                     opt = "流转新乡黑科质检";
                 }
-                else if (dapt == 332)
+                else if (CirculMarket(ua.F_DeptId, 332))
                 {
                     nextda = 339;
                     opt = "流转营销管理处";
@@ -1521,7 +1522,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     isbl = 1;
                     nextda = ua.F_DeptId;
                     opt = "流转" + deptname;
-                }
+                //}
                 //else
                 //{
                 //    nextda = ua.F_DeptId;
@@ -1531,11 +1532,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
             }
             if (istrue)
             {
-                cont = "大区经理已审批:"+ AuditCont+"," + opt;
+                if (ro.F_RoleCode == "DQJL")
+                {
+                    cont = "大区经理已审批:" + AuditCont + "," + opt;
+                }
+                else cont = "分公司经理已审批:" + AuditCont + "," + opt;
             }
             else
             {
-                cont = "大区经理未审批" + opt;
+                if (ro.F_RoleCode == "DQJL")
+                {
+                    cont = "大区经理未审批" + opt;
+                }
+                else
+                  cont = "分公司经理未审批" + opt;
             }
             if (nextda != 0)
             {
@@ -1570,7 +1580,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     overtime = int.Parse(it.F_LimitTime);
                 }
                 int sms = int.Parse(it.F_IsSMS.ToString());
-                if (F_RoleCode == "DQJL")
+                if (F_RoleCode == "DQJL" || F_RoleCode == "FGSJL")
                 {
                     if (hours >= 24)
                     {
@@ -1584,29 +1594,40 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 else
                 {
-                    var user = GetUser(ua);
-                    string deptname = "";
-                    string deptmodelsname = "";
-                    var deptmodel = departmentBLL.GetModel(user.F_DeptId);
-                    var deptmodels = departmentBLL.GetModel(ua.F_DeptId);
-                    if (deptmodel != null)
-                    {
-                        deptname = deptmodel.F_DeptName + "-";
-                    }
-                    if (deptmodels != null)
-                    {
-                        deptmodelsname = deptmodels.F_DeptName + "-";
-                    }
                     if (hours >= 24)
                     {
+                        var user = GetUser(ua);
+                        string deptname = "";
+                        string deptmodelsname = "";
+                        string namestr = "";
+                        Model.T_Sys_RoleInfo ro = rolebll.GetModel(user.F_RoleId);
+                        if (ro.F_RoleCode == "DQJL")
+                        {
+                            namestr = "大区经理";
+                        }
+                        else
+                        {
+                            namestr = "分公司经理";
+                        }
+                        var deptmodel = departmentBLL.GetModel(user.F_DeptId);
+                        var deptmodels = departmentBLL.GetModel(ua.F_DeptId);
+                        if (deptmodel != null)
+                        {
+                            deptname = deptmodel.F_DeptName + "-";
+                        }
+                        if (deptmodels != null)
+                        {
+                            deptmodelsname = deptmodels.F_DeptName + "-";
+                        }
                         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, overtime, sms);
+                        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 + ")" + "未审批流转"+ namestr + "", (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)
                     {
-                        GetDaQucirCulation("",user, it.F_CreateTime.ToString(), it.F_WoID, false);
+                        var user = GetUser(ua);
+                        GetDaQucirCulation("", user, it.F_CreateTime.ToString(), it.F_WoID, false);
                     }
                     else
                     {
@@ -2230,33 +2251,43 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// 获取问题类别
         /// </summary>
         /// <returns></returns>
-        public string GetComplaint(string msg)
+        public string GetComplaint(string msg, int type = 0)
         {
             string str = "";
-            string str1 = " select F_Id from T_Wo_QuestionManage where F_QuestionName in(" + msg + ")";
-          string str3 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str1 + ")";
-        var dept = quesBLL.GetModelList("F_ParentId in(" + str3 + ")");
+            string str1 = "";
+            string str3 = "";
+            if (type == 0)
+            {
+                str1 = " select F_Id from T_Wo_QuestionManage where F_QuestionName in(" + msg + ")";
+                str3 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str1 + ")";
+            }
+            else if (type == 1)
+            {
+                str3 = " select F_Id from T_Wo_QuestionManage where F_QuestionName in(" + msg + ")";
+            }
+            var dept = quesBLL.GetModelList("F_ParentId in(" + str3 + ")");
             if (dept != null)
-           {
+            {
                 foreach (var it in dept)
-               {
+                {
 
                     if (str != "")
-                      str += "','" + it.F_Id;
-                   else
-                       str += it.F_Id;
-           
+                        str += "','" + it.F_Id;
+                    else
+                        str += it.F_Id;
+
                 }
-           }
-           //  string str4 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str3 + ")";
+            }
+            //  string str4 = " select F_Id from T_Wo_QuestionManage where F_ParentId in(" + str3 + ")";
             return str;
         }
 
+
         /// <summary>
         ///综合查询列表
         /// </summary>
         public ActionResult GetComprehensive(string description,string code, string cusname,string createby, string starttime, string endtime, string keywords, string cusphone, string companyname, string province, string city,
-            string country, string township,string category,string salebase, string touser,string visitby, string visitresult, string question,int isdc=0,int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10)
+            string country, string township,string category,string salebase, string touser,string visitby, string visitresult, string question,int isdc=0,int source = 0,int state=-1, int type = 0, int pageindex = 1, int pagesize = 10, string question1="",string question2="")
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2299,12 +2330,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (QuestionManage.F_Type == EnumWOType.Complaint.ToString())
                         {
-                            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ('" + GetComplaint("'"+ question+"'") + "')"; ; 
+                            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ('" + GetComplaint("'"+ question+"'",0) + "')"; ; 
                         }
                         else
                             sql += $"  and T_Wo_WorkOrder.F_QuestionType  ='"+QuestionManage .F_Id +"'"; ;
                     }
-                  //  
+                }
+                if (!string.IsNullOrEmpty(question1))
+                {
+                    var QuestionManage = quesBLL.GetModelList("F_QuestionName='" + question1 + "'").FirstOrDefault();
+                    if (QuestionManage != null)
+                    {
+                        if (QuestionManage.F_Type == EnumWOType.Complaint.ToString())
+                        {
+                            sql += $"  and T_Wo_WorkOrder.F_QuestionType in ('" + GetComplaint("'" + question + "'",1) + "')"; ;
+                        }                      
+                    }
+                }
+                if (!string.IsNullOrEmpty(question2))
+                {
+                    var QuestionManage = quesBLL.GetModelList("F_QuestionName='" + question2 + "'").FirstOrDefault();
+                    if (QuestionManage != null)
+                    {
+                        if (QuestionManage.F_Type == EnumWOType.Complaint.ToString())
+                        {
+                            sql += $"  and T_Wo_WorkOrder.F_QuestionType  ='" + QuestionManage.F_Id + "'"; ;
+                        }                   
+                    }
+                    //  
                 }
                 if (source > 0)//工单来源
                 {
@@ -4214,26 +4267,34 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     if (deptmodel != null)
                     {
-                        if (deptmodel.F_Layer == 2)
-                        {
-                            Model.T_Sys_UserAccount userModel = sysUserAccountBll .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 = sysUserAccountBll.GetModelList(" F_DeptId=" + dept.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
-                                    return userModel1;
-                                }
-                            }
-                        }
-                        if (deptmodel.F_Layer == 1)
-                        {
-                            Model.T_Sys_UserAccount userModel = sysUserAccountBll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                        Model.T_Sys_UserAccount userModel = sysUserAccountBll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=60 ").FirstOrDefault();
+                        if (userModel != null)
                             return userModel;
+                        else
+                        {
+                            Model.T_Sys_UserAccount userModel1 = sysUserAccountBll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                            return userModel1;
                         }
+                        //if (deptmodel.F_Layer == 2)
+                        //{
+                        //    Model.T_Sys_UserAccount userModel = sysUserAccountBll.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 = sysUserAccountBll.GetModelList(" F_DeptId=" + dept.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                        //            return userModel1;
+                        //        }
+                        //    }
+                        //}
+                        //if (deptmodel.F_Layer == 1)
+                        //{
+                        //    Model.T_Sys_UserAccount userModel = sysUserAccountBll.GetModelList(" F_DeptId=" + deptmodel.F_DeptId + " and F_RoleId=62  ").FirstOrDefault();
+                        //    return userModel;
+                        //}
                     }
                     else
                     {
@@ -4419,41 +4480,41 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             AddLog(modlelist.F_ID, 0, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "创建工单", (int)EnumWorkOrderState.neworder, (int)EnumItemOpt.create, "", 0, ua, overtime, sms);
                             string opt = "";
 
-                            if (dapt != 0)
-                            {
-                                if (dapt == 11)
+                            //if (dapt != 0)
+                            //{
+                                if (CirculMarket(ua.F_DeptId,11))
                                 {
                                     nextda = 37;
                                     opt = "流转市场管理科";
                                 }
-                                else if (dapt == 14)
+                                else if (CirculMarket(ua.F_DeptId, 14))
                                 {
                                     nextda = 57;
                                     opt = "流转营销管理处";
                                 }
-                                else if (dapt == 15)
+                                else if (CirculMarket(ua.F_DeptId, 15))
                                 {
                                     nextda = 74;
                                     opt = "流转策划推广";
                                 }
-                                else if (dapt == 16)
+                                else if (CirculMarket(ua.F_DeptId, 16))
                                 {
                                     nextda = 88;
                                     opt = "流转销售部";
                                 }
-                                else if (dapt == 18)
+                                else if (CirculMarket(ua.F_DeptId, 18))
                                 {
                                     nextda = 268;
                                     opt = "流转车用尿素";
 
                                 }
 
-                                else if (dapt == 20)
+                                else if (CirculMarket(ua.F_DeptId, 20))
                                 {
                                     nextda = 295;
                                     opt = "流转新乡黑科质检";
                                 }
-                                else if (dapt == 332)
+                                else if (CirculMarket(ua.F_DeptId, 332))
                                 {
                                     nextda = 339;
                                     opt = "流转营销管理处";
@@ -4465,7 +4526,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     nextda = ua.F_DeptId;
                                     opt = "流转" + deptname;
                                 }
-                            }
+                            //}
                             if (nextda != 0)
                             {
                                 var res = AssignWO(ua, modlelist, input, opt, "", nextda, 0, 0, 0, 0, 0, 0, "", 1);
@@ -4495,6 +4556,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return Error("无操作权限！");
             }
         }
+
+        /// <summary>
+        /// 判断市场管理科
+        /// </summary>
+        /// <param name="deptid"></param>
+        /// <param name="pdeptid"></param>
+        /// <returns></returns>
+        public bool CirculMarket(int deptid, int pdeptid)
+        {
+            string sql = " F_State=1 ";
+            string dptcode = departmentBLL.GetModel(pdeptid).F_DeptCode;
+            string arrsql = " select F_DeptCode from T_Sys_Department where F_DeptCode LIKE '" + dptcode + "%' ";
+            sql += $" and F_DeptCode in ({arrsql}) and F_DeptId=" + deptid;
+            var modellist = departmentBLL.GetModelList(sql);
+            if (modellist.Count > 0)
+                return true;
+            else return false;
+        }
         /// <summary>
         /// 添加客户
         /// </summary>
@@ -4800,54 +4879,52 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     deptname1 = deptmodel1.F_DeptName ;
                                     dapt = deptmodel1.F_ParentId;
                                 }
-                                if (dapt != 0)
-                                {
-                                    if (dapt == 11)
+                                //if (dapt != 0)
+                                //{
+                                    if (CirculMarket(ua.F_DeptId, 11))
                                     {
                                         nextda = 37;
                                         opt = "流转市场管理科";
                                     }
-                                    else if (dapt == 14)
+                                    else if (CirculMarket(ua.F_DeptId, 14))
                                     {
                                         nextda = 57;
                                         opt = "流转营销管理处";
                                     }
-                                    else if (dapt == 15)
+                                    else if (CirculMarket(ua.F_DeptId, 15))
                                     {
                                         nextda = 74;
                                         opt = "流转策划推广";
                                     }
-                                    else if (dapt == 16)
+                                    else if (CirculMarket(ua.F_DeptId, 16))
                                     {
                                         nextda = 88;
                                         opt = "流转销售部";
                                     }
-                                    else if (dapt == 18)
+                                    else if (CirculMarket(ua.F_DeptId, 18))
                                     {
                                         nextda = 268;
                                         opt = "流转车用尿素";
 
                                     }
 
-                                    else if (dapt == 20)
+                                    else if (CirculMarket(ua.F_DeptId, 20))
                                     {
                                         nextda = 295;
                                         opt = "流转新乡黑科质检";
                                     }
-                                    else if (dapt == 332)
+                                    else if (CirculMarket(ua.F_DeptId, 332))
                                     {
                                         nextda = 339;
                                         opt = "流转营销管理处";
 
-
                                     }
                                     else if (ua.F_DeptId == 17 || ua.F_DeptId == 19 || ua.F_DeptId == 20 || ua.F_DeptId == 21)
                                     {
                                         nextda = ua.F_DeptId;
                                         opt = "流转" + deptname1;
                                     }
-
-                                }
+                                //}
                                 if (nextda != 0)
                                 {
                                     var res = AssignWO(ua, model, input, opt, "", nextda, 0, model.F_limit, 0,0,0,0,"",1);
@@ -6066,7 +6143,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         else if (deptmodel.F_DeptId == 12)
                                         {
                                         inputs.F_IsVisit = isvisit.ToString();
-                                    inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
+                                        inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         }
                                     }
@@ -7640,8 +7717,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// </summary>
         public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int clbm = 0, int clid = 0, int  overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, string creat = "",int isbl=0)
         {
-            if (model.F_limit > 0)
-                overtime = model.F_limit;
+            #region 系统升级派单时限可修改2021/12/24
+            //if (model.F_limit > 0)
+            //    overtime = model.F_limit;
+            #endregion
             string smscont = "";
             if (model.F_Type == "1")
             {