高层审批

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

@@ -1407,7 +1407,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         public string judgmentDept(int deptid)
         {
             string deptcode = "";
-            string sql = " ";
+            string sql = "";
 
             if (CirculMarket(deptid, 11))
             {
@@ -1444,6 +1444,49 @@ namespace CallCenterApi.Interface.Controllers.weixin
         }
 
         /// <summary>
+        /// 找到事业部中的高层
+        /// </summary>
+        /// <param name="deptid"></param>
+        /// <returns></returns>
+        public int GetGCDept(int deptid)
+        {
+            string deptcode = "";
+            int gcdeptid = 0;
+
+            if (CirculMarket(deptid, 11))
+            {
+                deptcode = "|0|1|11|";
+            }
+            else if (CirculMarket(deptid, 14))
+            {
+                deptcode = "|0|1|14|";
+            }
+            else if (CirculMarket(deptid, 15))
+            {
+                deptcode = "|0|1|15|";
+            }
+            else if (CirculMarket(deptid, 16))
+            {
+                deptcode = "|0|1|16|";
+            }
+            else if (CirculMarket(deptid, 18))
+            {
+                deptcode = "|0|1|18|";
+
+            }
+            else if (CirculMarket(deptid, 20))
+            {
+                deptcode = "|0|1|20|";
+            }
+            if (!string.IsNullOrEmpty(deptcode))
+            {
+                var dept = departmentBLL.GetModelList($" F_DeptCode LIKE '" + deptcode + "%' and F_DeptName like '%总经理%'").FirstOrDefault();
+                if (dept != null)
+                    gcdeptid = dept.F_DeptId;
+            }
+            return gcdeptid;
+        }
+        /// <summary>
         ///综合查询列表
         /// </summary>
         public ActionResult GetComprehensive(string description,string OpenId, string code, string createby, string createtel, string cusname, string keywords, string cusphone, string companyname, string province, string city,
@@ -1566,6 +1609,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 {
                                     sql += $"  and T_Wo_WorkOrder.F_ID in ( " + strsq + ") ";
                                 }
+                                else
+                                {
+                                    sql += $" and 1!=1";
+                                }
                             }
                             #endregion
                             else
@@ -2115,6 +2162,10 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                     {
                                         sql += $"  and T_Wo_WorkOrder.F_ID in ( " + strsq + ") ";
                                     }
+                                    else
+                                    {
+                                        sql += $" and 1!=1";
+                                    }
                                 }
                                 #endregion
                                 else
@@ -6169,39 +6220,73 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
 
         [WechatActionFilter]
-        public ActionResult HigApprovalOrder(string OpenId, long orderid, string cont)
+        public ActionResult HigApprovalOrder(string OpenId, long orderid, string cont, int isApproval = 0)
         {
             if (!string.IsNullOrEmpty(OpenId))
             {
                 var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
                 if (ua != null)
                 {
+                    string isagreestr = "";
+                    string touser = "";
                     Model.T_Wo_WorkOrder model = woBLL.GetModel(orderid);
                     //验证信息
                     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;
+                        var itemlist1 = itembll.GetModelList("  F_WoState=" + (int)EnumWorkOrderState.audit + " and  F_OptType=" + (int)EnumItemOpt.deal + "" + " and  F_WoID = " + orderid).Where(p => p.F_Type == 1 || p.F_Type == 3).OrderByDescending(t => t.F_CreateTime).FirstOrDefault();
+                        var itemlist2 = itembll.GetModelList("  F_WoState=" + (int)EnumWorkOrderState.audit + " and  F_OptType=" + (int)EnumItemOpt.deal + "" + " and  F_WoID = " + orderid).Where(p => p.F_Type == 2).OrderByDescending(t => t.F_CreateTime).FirstOrDefault();
                         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);
                             }
                         }
                         model.F_Highopinions = cont;
+                        if (isApproval == 1)
+                            isagreestr = " 通过 " + cont;
+                        else
+                            isagreestr = " 未通过 " + cont;
                         string deptname = "";
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                         {
                             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, overtime, sms, "", 1);
+                        if (itemlist1 != null)
+                        {
+                            int type = Convert.ToInt32(itemlist1.F_Type);
+                            if (isApproval == 1)
+                            {
+                                model.F_State = (int)EnumWorkOrderState.finish;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.finish, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "", 1, type);
+                            }
+                            else
+                            {
+                                touser = itemlist1.F_CreateUser;
+                                model.F_State = (int)EnumWorkOrderState.receive;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.receive, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.deal, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 0, type);
+                            }
+                        }
+                        if (itemlist2 != null)
+                        {
+                            int type = Convert.ToInt32(itemlist2.F_Type);
+                            if (isApproval == 1)
+                            {
+                                model.F_State2 = (int)EnumWorkOrderState.finish;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.finish, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "", 1, type);
+                            }
+                            else
+                            {
+                                touser = itemlist1.F_CreateUser;
+                                model.F_State2 = (int)EnumWorkOrderState.receive;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.receive, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.deal, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 0, type);
+                            }
+                        }
+
+                        //AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批"+ isagreestr, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 1);
                         bool n = woBLL.Update(model);
                         if (n)
                             return Success("审批成功");
@@ -6301,7 +6386,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         [WechatActionFilter]
         public ActionResult DealWorkOrder(string OpenId, long orderid, string F_Files, string cont, WorkOrdeDeptment deptment,
          string uncont = "",
-        int isvisit = 1, int isover = 0, int inoutflag = 0)
+        int isvisit = 1, int isover = 0, int inoutflag = 0, int isApprovalp = 0)
         {
             string markdepts = "37,57,74,88,268,295,339,422,213,427,433";
             string qualdepts = "12,36,295,245";
@@ -6388,7 +6473,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("工单已处理请勿重复操作！");
                             else
                             {
-                                var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, Convert.ToInt32(zflag));
+                                var res = DealWO(ua, model, F_Files, input, cont, isover, uncont, Convert.ToInt32(zflag),"", 0, isApprovalp);
                                 if (res)
                                     return Success("处理成功");
                                 else
@@ -7008,7 +7093,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string F_Files, WorkOrderNewInput input, string cont, int isover = 0, string uncont = "",int flag=1, string eventreason = "", int flagstate = 0)
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string F_Files, WorkOrderNewInput input, string cont, int isover = 0, string uncont = "",int flag=1, string eventreason = "", int flagstate = 0, int isApprovalp = 0)
         {
             #region 工单处理
             int sms = 0;
@@ -7047,6 +7132,31 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 nextuser = nowUser.F_UserCode;
                 nextdept = nowUser.F_DeptId;
             }
+            #region 高层审批
+            string htouser = "", htousername = ""; int hclbm = 0;
+            if (isApprovalp != 0)
+            {
+                hclbm = GetGCDept(nowUser.F_DeptId);
+                if (hclbm != 0)
+                {
+                    var cluslist = userAccountBLL.GetModelList($"F_DeptId = {hclbm}");
+                    if (cluslist.Count > 0)
+                    {
+                        foreach (var l in cluslist)
+                        {
+                            if (string.IsNullOrEmpty(htouser))
+                            {
+                                htouser = string.IsNullOrEmpty(htouser) ? l.F_UserCode : htouser + "," + l.F_UserCode;
+                                htousername = string.IsNullOrEmpty(htousername) ? l.F_UserName + "(" + l.F_WorkNumber + ")" : htousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
+                            }
+                        }
+                    }
+                    wostate = (int)EnumWorkOrderState.audit;
+                }
+
+            }
+
+            #endregion
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
@@ -7060,6 +7170,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
             var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag, flagstate);
+            if (hclbm>0)
+                AddLog(model.F_ID, (int)EnumWorkOrderState.audit, htousername + "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, model.F_limit, sms, "", 2, flag);
             if (itemid > 0)
             {
                 #region 处理工单

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

@@ -1243,7 +1243,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         }
                                         else
                                         {
-                                            sql += $"and 1!=1";
+                                            sql += $" and 1!=1";
                                         }
                                     }
                                     else
@@ -2407,6 +2407,49 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return sql;
         }
         /// <summary>
+        /// 找到事业部中的高层
+        /// </summary>
+        /// <param name="deptid"></param>
+        /// <returns></returns>
+        public int GetGCDept(int deptid)
+        {
+            string deptcode = "";
+            int gcdeptid = 0;
+
+            if (CirculMarket(deptid, 11))
+            {
+                deptcode = "|0|1|11|";
+            }
+            else if (CirculMarket(deptid, 14))
+            {
+                deptcode = "|0|1|14|";
+            }
+            else if (CirculMarket(deptid, 15))
+            {
+                deptcode = "|0|1|15|";
+            }
+            else if (CirculMarket(deptid, 16))
+            {
+                deptcode = "|0|1|16|";
+            }
+            else if (CirculMarket(deptid, 18))
+            {
+                deptcode = "|0|1|18|";
+
+            }
+            else if (CirculMarket(deptid, 20))
+            {
+                deptcode = "|0|1|20|";
+            }
+            if (!string.IsNullOrEmpty(deptcode))
+            {
+                var dept = departmentBLL.GetModelList($" F_DeptCode LIKE '" + deptcode + "%' and F_DeptName like '%总经理%'").FirstOrDefault();
+                if (dept != null)
+                    gcdeptid = dept.F_DeptId;
+            }
+            return gcdeptid;
+        }
+        /// <summary>
         /// 获取待接单的工单编号
         /// </summary>
         /// <returns></returns>
@@ -3231,6 +3274,10 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             {
                                 sql += $"  and T_Wo_WorkOrder.F_ID in ( " + strsq + ") ";
                             }
+                            else
+                            {
+                                sql += $" and 1!=1";
+                            }
                         }
                         #endregion
                         else
@@ -8886,7 +8933,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
      string F_Files, string uncont = "",
-          int isvisit = 1, int isover = 0,int inoutflag=0)
+          int isvisit = 1, int isover = 0,int inoutflag=0,int isApprovalp = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -9010,7 +9057,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             else
                             {
 
-                                var res = DealWO(ua, model, input, cont, F_Files, isover, uncont, Convert.ToInt32(zflag));
+                                var res = DealWO(ua, model, input, cont, F_Files, isover, uncont, Convert.ToInt32(zflag),0,isApprovalp);
 
                                 if (res)
                                     return Success("处理成功");
@@ -9036,7 +9083,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult HigApprovalOrder(long orderid, string cont)
+        public ActionResult HigApprovalOrder(long orderid, string cont,int isApproval=0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -9044,11 +9091,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
                 if (ua != null)
                 {
+                    string isagreestr = "";
+                    string touser = "";
                     Model.T_Wo_WorkOrder model = workOrder.GetModel(orderid);
                     //验证信息
                     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);
+                        var itemlist1 = itembll.GetModelList("  F_WoState=" + (int)EnumWorkOrderState.audit + " and  F_OptType=" + (int)EnumItemOpt.deal + "" + " and  F_WoID = " + orderid).Where(p=>p.F_Type==1 || p.F_Type == 3).OrderByDescending(t=>t.F_CreateTime).FirstOrDefault();
+                        var itemlist2 = itembll.GetModelList("  F_WoState=" + (int)EnumWorkOrderState.audit + " and  F_OptType=" + (int)EnumItemOpt.deal + "" + " and  F_WoID = " + orderid).Where(p => p.F_Type == 2).OrderByDescending(t => t.F_CreateTime).FirstOrDefault();
                         if (itemlast.Count > 0)
                         {
                             foreach (var it in itemlast)
@@ -9058,13 +9109,48 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                         }
                         model.F_Highopinions = cont;
+                        if (isApproval == 1)
+                            isagreestr = " 通过 "+ cont;
+                        else
+                            isagreestr = " 未通过 "+ cont;
                         string deptname = "";
                         var deptmodel = departmentBLL.GetModel(ua.F_DeptId);
                         if (deptmodel != null)
                         {
                             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);
+                        if (itemlist1 != null)
+                        {
+                            int type = Convert.ToInt32(itemlist1.F_Type);
+                            if (isApproval == 1)
+                            {
+                                model.F_State = (int)EnumWorkOrderState.finish;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.finish, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "", 1, type);
+                            }
+                            else
+                            {
+                                touser = itemlist1.F_CreateUser;
+                                model.F_State = (int)EnumWorkOrderState.receive;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.receive, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.deal, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 0, type);
+                            }
+                        }
+                        if (itemlist2 != null)
+                        {
+                            int type = Convert.ToInt32(itemlist2.F_Type);
+                            if (isApproval == 1)
+                            {
+                                model.F_State2 = (int)EnumWorkOrderState.finish;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.finish, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, "", 0, ua, 0, 0, "", 1, type);
+                            }
+                            else
+                            {
+                                touser = itemlist1.F_CreateUser;
+                                model.F_State2 = (int)EnumWorkOrderState.receive;
+                                AddLog(model.F_ID, (int)EnumWorkOrderState.receive, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批" + isagreestr, (int)EnumItemType.deal, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 0, type);
+                            }
+                        }
+
+                        //AddLog(model.F_ID, model.F_State.Value, deptname + ua.F_UserName + "(" + ua.F_WorkNumber + ")" + "高层已审批"+ isagreestr, (int)EnumItemType.audit, (int)EnumItemOpt.reaudit, touser, 0, ua, 0, 0, "", 1);
                         bool n = workOrder.Update(model);
                         if (n)
                             return Success("审批成功");
@@ -10024,7 +10110,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 处理工单
         /// </summary>
-        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int isover = 0, string uncont = "", int flag = 1,string eventreason="",int flagstate=0)
+        public bool DealWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, string F_Files, int isover = 0, string uncont = "", int flag = 1,int flagstate=0, int isApprovalp = 0)
         {
             #region 工单处理
             int sms = 0;
@@ -10062,6 +10148,33 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 nextuser = nowUser.F_UserCode;
                 nextdept = nowUser.F_DeptId;
             }
+
+            #region 高层审批
+            string htouser = "", htousername = ""; int hclbm = 0;
+            if (isApprovalp != 0)
+            {
+                 hclbm = GetGCDept(nowUser.F_DeptId);
+                if (hclbm != 0)
+                {
+                    var cluslist = sysUserAccountBll.GetModelList($"F_DeptId = {hclbm}");
+                    if (cluslist.Count>0)
+                    {
+                        foreach (var l in cluslist)
+                        {
+                            if (string.IsNullOrEmpty(htouser))
+                            {
+                                htouser = string.IsNullOrEmpty(htouser)? l.F_UserCode: htouser + "," + l.F_UserCode;
+                                htousername = string.IsNullOrEmpty(htousername) ? l.F_UserName + "(" + l.F_WorkNumber + ")": htousername + "," + l.F_UserName + "(" + l.F_WorkNumber + ")";
+                            }                          
+                        }
+                    }
+                    wostate = (int)EnumWorkOrderState.audit;                  
+                }
+              
+            }
+
+            #endregion
+
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
@@ -10075,6 +10188,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 optcont = "，处理内容：" + cont;
             var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ")" + opt + "工单" + optcont;
             var itemid = AddLog(model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, nextuser, nextdept, nowUser, model.F_limit, sms, "", 0, flag, flagstate);
+            if (hclbm > 0)
+                AddLog(model.F_ID, (int)EnumWorkOrderState.audit, htousername + "高层待审批", (int)EnumItemType.audit, (int)EnumItemOpt.audit, htouser, hclbm, nowUser, model.F_limit, sms, "", 2, flag);
             if (itemid > 0)
             {
                 #region 处理工单