微信工单

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

@@ -235,6 +235,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         sql += $" and F_State=" + (int)EnumWorkOrderState.finish + " and F_IsVisit = '" + "0" + "' "; ;
                         break;
+                    case 8://待审批
+                        if (ro.F_RoleCode == "GC")
+                        {
+                            if (GetDJDWorkOrderID(ua.F_UserCode) != "")
+                            {
+                                sql += $"  and T_Wo_WorkOrder.F_ID in ( " + GetDJDWorkOrderID(ua.F_UserCode) + ") "; ;
+                            }
+                        }
+                        else
+                        {
+
+                            return Success("暂无工单"); ;
+                        }
+                        break;
                 }
                 #endregion
                 int recordCount = 0;
@@ -269,7 +283,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 else
                 {
 
-                    return Success("暂无工单"); ;
+                     return Success("暂无工单"); ;
                 }
             }
             else
@@ -321,9 +335,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
         public string GetCYWorkOrderID(string user)
         {
             string str = string.Empty;
-
-            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser='" + user + "' ";
-
+            str = "select F_WoID from T_Wo_WorkOrderItem_New where F_CreateUser in(" + user + ")"
+            
+             ;
             return str;
         }
         /// <summary>
@@ -1621,9 +1635,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_VisitResult = model1[i].F_VisitResult;//回访结果：非常满意、满意、一般、不满意
                     model.F_VisitReason = model1[i].F_VisitReason;// 回访不满意原因
                     model.F_Callresults = model1[i].F_Callresults;//呼叫结果
+                    model.F_Highopinions = model1[i].F_Highopinions;//高层处理意见
 
-
-
+                    model.F_IsAudit = model1[i].F_IsAudit;//是否审核
+                    model.F_Highopinions = model1[i].F_Highopinions;//高层处理意见
+                    if (model1[i].F_AuditState == 0)
+                    {
+                        model.F_AuditState = "同意上报";
+                    }
+                    else if (model1[i].F_AuditState == 1)
+                    {
+                        model.F_AuditState = "驳回修订";
+                    }
+                    else
+                    {
+                        model.F_AuditState = "强制结案";
+                    }
+                    model.F_AuditBy = model1[i].F_AuditBy;//审核人
+                    model.F_AuditOn = model1[i].F_AuditOn;//审核时间
+                    model.F_AuditCont = model1[i].F_AuditCont;//审核内容
                     model.F_IsOver = model1[i].F_IsOver;
                  
                     if (userId >0)
@@ -2006,6 +2036,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         }
                                         else if (deptmodel.F_DeptId == 12)
                                         {
+                                        inputs.F_IsVisit = isvisit;
                                         inputs.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         inputs.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                         }
@@ -2061,7 +2092,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         [Authority]
         public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, int isvisit=1,
-            float overtime =0,int sms=0,int clbm = 0, int clid = 0)
+            float overtime =0,int sms=0,int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
@@ -2121,6 +2152,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                     }
                                     else if (deptmodel.F_DeptId == 12)
                                     {
+                                        input.F_IsVisit = isvisit;
                                         input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                         input.F_ZL_ClaimAmount = deptment.ClaimAmount;// 质量管理科-索赔金额（单位元，对应责任单位）
                                     }
@@ -2146,7 +2178,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                    
                     if (model != null)
                     {
-                        var res = AssignWO(ua, model, input,cont, clbm, clid, overtime, sms );
+                        var res = AssignWO(ua, model, input,cont, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid);
                         if (res)
                             return Success("转派成功");
                         else
@@ -2215,7 +2247,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         [Authority]
         public ActionResult DealWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment,
             string uncont="",
-          int isvisit=0,  int isover = 0)
+          int isvisit=1,  int isover = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2264,6 +2296,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 }
                                 else if (deptmodel.F_DeptId == 12)
                                 {
+                                    input.F_IsVisit = isvisit;
                                     input.F_ZL_CJ_IsRecord = deptment.IsRecord;//质量管理科-抽检-未备案、已备案
                                 }
                             }
@@ -2299,6 +2332,36 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return Error("无操作权限！");
         }
         /// <summary>
+        /// 高层审批
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult HigApprovalOrder( long orderid, string cont)
+        {
+            int userId = CurrentUser.UserData.F_UserId;
+            if (userId != 0)
+            {
+                Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
+                if (ua != null)
+                {
+                    Model.T_Wo_WorkOrder model = workOrder  .GetModel(orderid);
+                    //验证信息
+                    if (model != null)
+                    {
+                        model.F_Highopinions = cont;
+                        bool n = workOrder.Update(model);
+                        if (n)
+                            return Success("审批成功");
+                        else
+                            return Error("审批失败！");
+                    }
+                    return Error("工单不存在");
+                }
+            }
+            return Error("无操作权限");
+        }
+        /// <summary>
         /// 退回工单
         /// </summary>
         /// <param name="input"></param>
@@ -2334,7 +2397,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call )
+        public ActionResult ReturnvisitOrder(long orderid, string cont, string reason, string call ,int  isOver=0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -2346,7 +2409,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //验证信息
                     if (model != null)
                     {
-                        var res = Retu(ua, model, cont, reason, call);
+                        var res = Retu(ua, model, cont, reason, call, isOver);
                         if (res)
                             return Success("回访成功");
                         else
@@ -2609,7 +2672,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 回访工单
         /// </summary>
-        public bool Retu(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont,string reason, string call)
+        public bool Retu(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, string cont,string reason, string call, int isOver = 0)
         {
             #region 工单处理
             int overtime = 0, sms = 0;
@@ -2626,8 +2689,13 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
             }
             var opt = "回访";
+
             int optbut = (int)EnumItemOpt.visit;
             int wostate = (int)EnumWorkOrderState.evaluate;
+            if (isOver==0)
+            {                                                                                                                                                                                                                                                                                                                                                                                                    
+                wostate = (int)EnumWorkOrderState.finish;
+            }
             #region 读取当前登录人部门
             string deptname = "";
             var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
@@ -2642,10 +2710,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             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();
             if (itemlast != null)
                 touser = itemlast.F_CreateUser;
-            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, overtime, sms);
+            var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, overtime, sms);
             if (itemid > 0)
             {
                 #region 处理工单
+                model.F_State  = wostate;
                 model.F_VisitOn = DateTime .Now ;
                 model.F_VisitResult = cont ;
                 model.F_VisitReason = reason;
@@ -2715,7 +2784,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 #region 处理工单
                 model.F_VisitOn = DateTime.Now;
-                
+                model.F_State = wostate;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息
@@ -2813,12 +2882,15 @@ 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();
-                if (itemlast.F_CreateUser != model.F_CreateBy)
+                if (itemlast!=null )
                 {
-                    sendsysmsg(model, nowUser, itemlast.F_CreateUser, (int)itemid, opt);
-                    var lastUser = sysUserAccountBll.GetModel(itemlast.F_CreateUser);
-                    if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
-                       sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
+                    if (itemlast.F_CreateUser != model.F_CreateBy)
+                    {
+                        sendsysmsg(model, nowUser, itemlast.F_CreateUser, (int)itemid, opt);
+                        var lastUser = sysUserAccountBll.GetModel(itemlast.F_CreateUser);
+                        if (lastUser != null && !string.IsNullOrEmpty(lastUser.F_WxOpenId))
+                            sendwxmsg(model, lastUser.F_WxOpenId, nowUser, opt);
+                    }
                 }
                 #endregion
                 #region 办理完结向客户发送消息
@@ -2964,13 +3036,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 转派工单
         /// </summary>
-        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, float overtime = 0, int sms = 0)
+        public bool AssignWO(Model.T_Sys_UserAccount nowUser, Model.T_Wo_WorkOrder model, WorkOrderNewInput input, string cont, int clbm = 0, int clid = 0, float overtime = 0, int sms = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0)
         {
             string touser = ""; string tousername = "";
+            int deptid = 0;
             #region 获取接收人
             if (clid != 0)
             {
                 Model.T_Sys_UserAccount clus = sysUserAccountBll.GetModel(clid);
+                deptid = clus.F_DeptId;
                 if (clus != null)
                 {
                     touser = clus.F_UserCode;
@@ -2980,6 +3054,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             else
             {
                 string users = string.Empty;
+                deptid = clbm;
                 var list = sysUserAccountBll.GetModelList(" F_DeptId='" + clbm + "'");
                 foreach (var l in list)
                 {
@@ -2996,6 +3071,30 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 }
                 touser = users;
             }
+            if (isApprovalp != 0&& deptid == 37)
+            {
+                if (hclid != 0)
+                {
+                    Model.T_Sys_UserAccount clus = sysUserAccountBll .GetModel(hclid);
+                    if (clus != null)
+                    {
+                        if (string.IsNullOrEmpty(touser))
+                        {
+                            touser = touser + "," + clus.F_UserCode;
+                            tousername = tousername + "," + clus.F_UserName + "(" + clus.F_UserCode + ")";
+                        }
+                    }
+                }
+                else
+                {
+                    var list = sysUserAccountBll .GetModelList(" F_DeptId='" + hclbm + "'");
+                    foreach (var l in list)
+                    {
+                        touser = touser + "," + l.F_UserCode;
+                        tousername = tousername + "," + l.F_UserName + "(" + l.F_UserCode + ")";
+                    }
+                }
+            }
             #endregion
             #region 工单处理
             var opt = "指派";

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

@@ -509,7 +509,7 @@ namespace CallCenterApi.Interface.Models.Input
         /// <summary>
         /// 审核状态
         /// </summary>
-        public int? F_AuditState
+        public string  F_AuditState
         {
             get; set;
         }
@@ -675,6 +675,12 @@ namespace CallCenterApi.Interface.Models.Input
         {
             get; set;
         }
-
+        /// <summary>
+        /// 高层处理意见
+        /// </summary>
+        public string F_Highopinions
+        {
+            get;set;
+        }
     }
 }

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -94,6 +94,18 @@ namespace CallCenterApi.Model
         private string _f_companyname;
         private string _f_wxopenid;
         private string _f_callresults;
+        private string _f_highopinions;
+        /// <summary>
+        /// 高层处理意见
+        /// </summary>
+        public string F_Highopinions
+        {
+            set { _f_highopinions = value; }
+            get { return _f_highopinions; }
+        }
+        /// <summary>
+        /// 呼叫结果
+        /// </summary>
         public string F_Callresults
         {
             set { _f_callresults = value; }