1

codegit/CallCenterApi/CallCenterApi.DAL/T_Bus_WorkOrder.cs

@@ -894,7 +894,7 @@ namespace CallCenterApi.DAL
                 " F_ProductDate,F_BatchNumber, F_Manufacturer,F_ProblemCode,F_QualityProblem," +
                 "  Notifications = f.F_UserName + '(' + f.F_Mobile + ')', ReceivingPerson =g.F_UserName, F_DealResult = h.F_DealResult, " +
                 " case c.F_State when 0 then '待提交'when 1 then '待分派' when 3 then '待处理' when 4 then '处理中' when 5 then '退回待分派'" +
-                " when 6 then '退回待提交' when 10 then '已处理' else '-' end F_State," +
+                " when 6 then '退回待提交' when 10 then '已处理' when 11 then '待审核' else '-' end F_State," +
                 " case c.F_Type when 1 then '咨询' when 2 " +
                 " then '投诉' when 3 then '重复' when 4 then '抽检' when 5 then '生鲜品' when 6 then '禽产品' " +
                 " when 7 then '综合事业部' when 8 then '餐饮事业部' when 9 then '400热线接听' when 10 then '线上投诉' " +
@@ -950,7 +950,7 @@ namespace CallCenterApi.DAL
                 " F_ProductDate,F_BatchNumber, F_Manufacturer,F_ProblemCode,F_QualityProblem,Notifications =f.F_UserName +'(' +f.F_Mobile + ')'  ," +
                 " ReceivingPerson = g.F_UserName, F_DealResult = h.F_DealResult, case c.F_State when 0 then '待提交'when 1 then " +
                 " '待分派' when 3 then '待处理' when 4 then '处理中' when 5 then '退回待分派' when 6 then '退回待提交' when 10 then " +
-                " '已处理' else '-' end F_State , case c.F_Type when 1 then '咨询' when 2 then '投诉' " +
+                " '已处理' when 11 then '待审核' else '-' end F_State , case c.F_Type when 1 then '咨询' when 2 then '投诉' " +
                 "when 3 then '重复' when 4 then '抽检' when 5 then '生鲜品' when 6 then '禽产品' " +
                 " when 7 then '综合事业部' when 8 then '餐饮事业部' when 9 then '400热线接听' when 10 then '线上投诉' " +
                 "when 11 then '市场监管局投诉' when 12 then '电商投诉'" +

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/HomeController.cs

@@ -15,9 +15,9 @@ namespace CallCenterApi.Interface.Controllers
     public class HomeController : BaseController
     {
         // GET: Home
-        public ActionResult Index()
+        public string  Index()
         {
-            return Success("成功");
+            return "";
         }
         [Authorize]
         public JsonResult json1()

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

@@ -2204,8 +2204,8 @@ namespace CallCenterApi.Interface.Controllers.report
                     aftersale.area = Area[i].F_DeptName;//大区
                     var group = workoeder.Where(p => p.F_Area == Area[i].F_DeptId.ToString());//投诉总量
                     aftersale.total = group.Count();
-                    aftersale.processingnumber = group.Where(p => p.F_State == 4).Count();//处理中投诉
                     aftersale.processednumber = group.Where(p => p.F_State == 10).Count();//已处理投诉
+                    aftersale.processingnumber = aftersale.total - aftersale.processednumber;//处理中投诉
                     float d = 0;
                     if (aftersale.total > 0)
                     {
@@ -2242,8 +2242,9 @@ namespace CallCenterApi.Interface.Controllers.report
                     aftersalelist.Add(aftersale);
                 }
                 complaints.total = workoeder.Count();
-                complaints.processingnumber = workoeder.Where(p => p.F_State == 4).Count();//处理中投诉
+               
                 complaints.processednumber = workoeder.Where(p => p.F_State == 10).Count();//已处理投诉
+                complaints.processingnumber = complaints.total- complaints.processednumber;//处理中投诉
                 if (complaints.total > 0)
                     complaints.processedrate = string.Format("{0:f2}%", (float)complaints.processednumber / complaints.total * 100);//完结率
                 else

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

@@ -451,6 +451,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (ro.F_RoleCode == "QTJS")
                                 return Error("无操作权限");
                             break;
+                        case 12://已完结
+                            sql += "AND c.F_State=11";
+                            sql += RetuSql(ro, see, ua);
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                            {
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
+                            }
+
+                            if (ro.F_RoleCode == "QTJS")
+                                return Error("无操作权限");
+                            break;
                     }
                 }
                 else
@@ -1903,7 +1914,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                 }
                 //      model.F_ImplementationSituation = it.F_ImplementationSituation;//落实情况
-                model.F_State = it.F_State;//处理进度0待提交、1待查收、2待分派、3待接收、4处理中、10已完成
+                model.F_State = it.F_State;//处理进度0待提交、1待查收、2待分派、3待接收、4处理中、10已完成11已审核
                 model.F_Duplicate = it.F_Duplicate;//重复工单0未重复1重复
                 model.F_Content = it.F_Content;//备注
                  model . F_IsReduction= it.F_IsReduction;//是否减免
@@ -3062,6 +3073,42 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return NoToken("未知错误，请重新登录");
         }
         /// <summary>
+        /// 审核工单
+        /// </summary>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult ReviewWorkOrder(int id, string cont, int state = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                if (state<1)
+                {
+                    return Error("请选择审核结果");
+                }
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
+                    if (ua != null)
+                    {
+                        Model.T_Bus_WorkOrder model = workorderBLL.GetModel(id);
+                        if (model != null)
+                        {
+                            var res = Review(ua, model, cont, state);
+                            if (res)
+                                return Success("审核成功");
+                            else
+                                return Error("审核失败！");
+                        }
+                        else
+                            return Error("工单不存在！");
+                    }
+                }
+                return Error("无操作权限！");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        /// <summary>
         /// 退回工单
         /// </summary>
         /// <param name="orderid"></param>
@@ -3316,6 +3363,75 @@ namespace CallCenterApi.Interface.Controllers.workorder
             #endregion
         }
         /// <summary>
+        /// 审核工单
+        /// </summary>
+        public bool Review(Model.T_Sys_UserAccount nowUser, Model.T_Bus_WorkOrder model, string cont, int state = 0)
+        {
+            #region 工单处理
+            string creatuser = "";
+            var opt = "审核通过";
+            int optbut = 10;
+            int wostate = 10;
+            string touser = "";
+            int deptid = 0;
+            if (state == 2)
+            {
+                opt = "审核拒绝";
+                optbut = 5;
+                wostate = 5;
+                var itemlast = itembll.GetModelList(" F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                     creatuser = itemlast.F_CreateUser;
+                }
+               
+                touser = nowUser.F_UserCode;
+                deptid = nowUser.F_DeptId;
+            }
+            int F_Largeareaid = 0, F_Officeid = 0;
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var optcont = "";
+            if (!string.IsNullOrEmpty(cont))
+                optcont = "，审核意见：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
+            var itemid = AddLog(model.F_Id, wostate, content, 1, optbut, touser, deptid, nowUser);
+            if (itemid > 0)
+            {
+                #region 处理工单
+                if (state==2)
+                {
+                    model.F_Officeid = F_Officeid;
+                    model.F_Largeareaid = F_Largeareaid;
+                    model.F_Notifications = creatuser;//通知人
+                    if (wostate == 5)
+                    {
+                        if (model.F_TobeallocatedTime == null)
+                            model.F_TobeallocatedTime = DateTime.Now;
+                    }
+                    if (!string.IsNullOrEmpty(model.F_Returnnote))
+                        model.F_Returnnote += "," + cont;
+                    else
+                        model.F_Returnnote += cont;
+                }
+                model.F_State = wostate;
+                workorderBLL.Update(model);
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
+
+
+        /// <summary>
         /// 减免工单
         /// </summary>
         /// <param name="orderid"></param>
@@ -3748,22 +3864,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
 
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
-            if (F_IsUsed == 0)
-            {
-
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
+          
             itemModel.F_WoID = woid;
             itemModel.F_WoState = wostate;
             itemModel.F_ItemType = itemtype;
@@ -3778,6 +3879,28 @@ namespace CallCenterApi.Interface.Controllers.workorder
             itemModel.F_CreateUser = nowUser.F_UserCode;
             
             var res = itembll.Add(itemModel);
+            if (res>0)
+            {
+                #region 
+                //处理当前工单的记录之前的记录过期
+                var itemlast = itembll.GetModelList
+                    (" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype 
+                    + " and  F_WoID=" + woid + " and F_ID< '"+ res + "' ");
+                if (F_IsUsed == 0)
+                {
+
+                    if (itemlast.Count > 0)
+                    {
+                        foreach (var it in itemlast)
+                        {
+                            it.F_IsUsed = 1;
+                            itembll.Update(it);
+                        }
+                    }
+                }
+                #endregion
+            }
+
             return res;
         }
 

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

@@ -154,7 +154,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 DataTable dt = new DataTable();
                 Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
-                int DTJ = 0, DFP = 0, DCL = 0, CLZ = 0, YWJ = 0, THDTJ = 0, THDFP = 0, YJGD = 0, EJGD = 0, SJGD = 0, CJSL=0,ZX=0;
+                int DTJ = 0, DFP = 0, DCL = 0, CLZ = 0, YWJ = 0, THDTJ = 0, THDFP = 0, YJGD = 0, EJGD = 0, SJGD = 0, CJSL=0,ZX=0,
+                    DSH=0;
                 string where = $" and (F_Type=" + 2 + "or (F_Duplicate!=1 and F_Duplicate!=4  and F_Type=3) or F_Type>4 )";
                if (ro.F_RoleCode == "DS")//电商角色
                 {
@@ -358,6 +359,26 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             }
                             ZX = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder WITH(NOLOCK)  where {sql} ").ToString());//待处理
                             break;
+                        case 12://待审核
+                            sql = "";
+                            sql += $"  F_IsDelete=0";
+                            sql += "AND F_Duplicate !=5" + where;
+                            sql += "AND F_State=11";
+                            sql += RetuSql(ro, 0, ua);
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                            {
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
+                            }
+
+                            if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
+                                sql += "AND F_CreateUser=" + ua.F_UserCode;
+                            if (ro.F_RoleCode == "QTJS")
+                            {
+                                YWJ = 0;
+                                break;
+                            }
+                            DSH = int.Parse(DbHelperSQL.GetSingle($"select COUNT(1) from T_Bus_WorkOrder WITH(NOLOCK) where {sql} ").ToString());//待处理
+                            break;
 
                     }
 
@@ -377,7 +398,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     EJGD = EJGD,
                     SJGD = SJGD,
                     CJSL= CJSL,
-                    ZX= ZX
+                    ZX= ZX,
+                    DSH= DSH
                 };
                 return Content(obj.ToJson()); ;
             }
@@ -692,6 +714,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             if (ro.F_RoleCode == "QTJS")
                                 return Error("无操作权限");
                             break;
+                        case 12://已完结
+                            sql += "AND F_State=11";
+                            sql += RetuSql(ro, see, ua);
+
+                            if (ro.F_RoleCode == "YWY" || ro.F_RoleCode == "ZG")
+                            {
+                                sql += "AND F_Notifications ='" + ua.F_UserCode + "'";
+                            }
+                            //      if (ro.F_RoleCode == "JDYPTZX" || ro.F_RoleCode == "JDYBTZX")
+                            //    sql += "AND F_CreateUser=" + ua.F_UserCode;
+                            if (ro.F_RoleCode == "QTJS")
+                                return Error("无操作权限");
+                            break;
                     }
                 }
                 else
@@ -948,7 +983,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var buttons = ButtonGroup.GetButtons(model.F_State.ToString (), ro.F_RoleCode );
                  if (ro.F_RoleCode== "CLZY")
                 {
-                    if (model.F_State==1 || model.F_State == 10 || model.F_State == 3 || model.F_State == 5 || model.F_State == 4)
+                    if (model.F_State==1  || model.F_State == 3 || model.F_State == 5 || model.F_State == 4)
                     {
                         buttons.Add(ButtonGroup.goback());
                     }
@@ -1598,6 +1633,42 @@ namespace CallCenterApi.Interface.Controllers.workorder
             return NoToken("未知错误，请重新登录");
         }
         /// <summary>
+        /// 审核工单
+        /// </summary>
+        /// <returns></returns>
+        [Authority]
+        public ActionResult ReviewWorkOrder(int id, string cont, int state = 0)
+        {
+            if (Request.IsAuthenticated)
+            {
+                if (state < 1)
+                {
+                    return Error("请选择审核结果");
+                }
+                int userId = CurrentUser.UserData.F_UserId;
+                if (userId != 0)
+                {
+                    Model.T_Sys_UserAccount ua = userBLL.GetModel(userId);
+                    if (ua != null)
+                    {
+                        Model.T_Bus_WorkOrder model = workorderBLL.GetModel(id);
+                        if (model != null)
+                        {
+                            var res = Review(ua, model, cont, state);
+                            if (res)
+                                return Success("审核成功");
+                            else
+                                return Error("审核失败！");
+                        }
+                        else
+                            return Error("工单不存在！");
+                    }
+                }
+                return Error("无操作权限！");
+            }
+            return NoToken("未知错误，请重新登录");
+        }
+        /// <summary>
         /// 催单
         /// </summary>
         /// <param name="orderid"></param>
@@ -1908,8 +1979,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
               
                 opt = "处理完结";
-                optbut = 10;
-                wostate =10;
+                optbut = 11;
+                wostate =11;
                 model.F_DealUser = nowUser.F_UserCode;
                 model.F_DealTime = DateTime.Now;
             }
@@ -1994,6 +2065,73 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 return false;
             #endregion
         }
+        /// <summary>
+        /// 审核工单
+        /// </summary>
+        public bool Review(Model.T_Sys_UserAccount nowUser, Model.T_Bus_WorkOrder model, string cont, int state = 0)
+        {
+            #region 工单处理
+            string creatuser = "";
+            var opt = "审核通过";
+            int optbut = 10;
+            int wostate = 10;
+            string touser = "";
+            int deptid = 0;
+            if (state == 2)
+            {
+                opt = "审核拒绝";
+                optbut = 5;
+                wostate = 5;
+                var itemlast = itembll.GetModelList(" F_ItemType=" + 1 + " and  F_WoID=" + model.F_Id + "and  F_WoState=3  order by F_ID desc ").FirstOrDefault(); ;
+                if (itemlast != null)
+                {
+                    creatuser = itemlast.F_CreateUser;
+                }
+
+                touser = nowUser.F_UserCode;
+                deptid = nowUser.F_DeptId;
+            }
+            int F_Largeareaid = 0, F_Officeid = 0;
+            #region 读取当前登录人部门
+            string deptname = "";
+            var deptmodel = departmentBLL.GetModel(nowUser.F_DeptId);
+            if (deptmodel != null)
+            {
+                deptname = deptmodel.F_DeptName + "-";
+            }
+            #endregion
+            var optcont = "";
+            if (!string.IsNullOrEmpty(cont))
+                optcont = "，审核意见：" + cont;
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_UserCode + ")" + opt + "工单" + optcont;
+            var itemid = AddLog(model.F_Id, wostate, content, 1, optbut, touser, deptid, nowUser);
+            if (itemid > 0)
+            {
+                #region 处理工单
+                if (state == 2)
+                {
+                    model.F_Officeid = F_Officeid;
+                    model.F_Largeareaid = F_Largeareaid;
+                    model.F_Notifications = creatuser;//通知人
+                    if (wostate == 5)
+                    {
+                        if (model.F_TobeallocatedTime == null)
+                            model.F_TobeallocatedTime = DateTime.Now;
+                    }
+                    if (!string.IsNullOrEmpty(model.F_Returnnote))
+                        model.F_Returnnote += "," + cont;
+                    else
+                        model.F_Returnnote += cont;
+                }
+                model.F_State = wostate;
+                workorderBLL.Update(model);
+                #endregion
+                return true;
+            }
+            else
+                return false;
+            #endregion
+        }
 
         /// <summary>
         /// 转派工单
@@ -2099,22 +2237,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         {
           
             Model.T_Wo_WorkOrderItem_New itemModel = new Model.T_Wo_WorkOrderItem_New();
-            #region 
-            //处理当前工单的记录之前的记录过期
-            var itemlast = itembll.GetModelList(" isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " ");
-            if (F_IsUsed==0)
-            {
-
-                if (itemlast.Count > 0)
-                {
-                    foreach (var it in itemlast)
-                    {
-                        it.F_IsUsed = 1;
-                        itembll.Update(it);
-                    }
-                }
-            }
-            #endregion
+          
             itemModel.F_WoID = woid;
             itemModel.F_WoState = wostate;
             itemModel.F_ItemType = itemtype;
@@ -2129,6 +2252,29 @@ namespace CallCenterApi.Interface.Controllers.workorder
             itemModel.F_CreateUser = nowUser.F_UserCode;
            
             var res = itembll.Add(itemModel);
+            if(res>0)
+            {
+                #region 
+                //处理当前工单的记录之前的记录过期
+                var itemlast = itembll.GetModelList(" " +
+                    "isnull(F_IsUsed,'0')='0' and F_ItemType=" + itemtype + " and  F_WoID=" + woid + " " +
+                    " and F_ID < '"+ res + "'");
+                if (F_IsUsed == 0)
+                {
+
+                    if (itemlast.Count > 0)
+                    {
+                        foreach (var it in itemlast)
+                        {
+                            it.F_IsUsed = 1;
+                            itembll.Update(it);
+                        }
+                    }
+                }
+                #endregion
+            }
+
+
             return res;
         }
     }

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -41,6 +41,10 @@ namespace CallCenterApi.Interface.Models.Common
         {
             return new button(10, "完善");
         }
+        public static button review()
+        {
+            return new button(11, "审核");
+        }
         /// <summary>
         /// 按钮类
         /// </summary>
@@ -154,7 +158,7 @@ namespace CallCenterApi.Interface.Models.Common
                     else if (code == "YWY" || code == "XTGLY" || code == "ZG")
                     {
                         buttons.Add(handle());
-                        buttons.Add(goback());
+                        //buttons.Add(goback());
                         
                     }
                     else if (code == "CLZY")
@@ -163,6 +167,24 @@ namespace CallCenterApi.Interface.Models.Common
                         buttons.Add(Perfect());
                     }
                     break;
+                case "11":
+                    //坐席 坐席班长 管理员
+                    if (code == "BSCJL" || code == "XTGLY")
+                    {
+                        buttons.Add(assign());
+                    }
+                    else if (code == "YWY" || code == "XTGLY" || code == "ZG")
+                    {
+                        buttons.Add(handle());
+                        buttons.Add(review());
+
+                    }
+                    else if (code == "CLZY")
+                    {
+                        buttons.Add(review());
+                        buttons.Add(Perfect());
+                    }
+                    break;
             }
             return buttons;
         }