分支

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -1286,6 +1286,10 @@ namespace CallCenterApi.DAL
                 {
                     model.F_Flag = int.Parse(row["F_Flag"].ToString());
                 }
+                if (row["F_Highopinions"] != null)
+                {
+                    model.F_Highopinions = row["F_Highopinions"].ToString();
+                }
 
 
             }

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

@@ -5596,13 +5596,13 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 deptname = deptmodel.F_DeptName + "-";
             }
             #endregion
-            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") 完结工单";
+            var content = deptname + nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") 自动关闭工单";
 
             //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
             if (isOver >= 1)
             {
                 #region 处理工单
-                model.F_VisitOn = DateTime.Now;
+                //model.F_VisitOn = DateTime.Now;
                 if (isOver == 1)
                 {
                     AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit, sms, "", 0, 1);
@@ -6234,8 +6234,6 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     if (model != null)
                     {
                         var itemlast = itembll.GetModelList("  F_ItemType=" + (int)EnumItemType.audit + " and  F_OptType=" + (int)EnumItemOpt.audit + "and F_NextUser= '" + ua.F_UserCode + "'" + "and F_IsUsed=2  and  F_WoID = " + orderid);
-                        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)
@@ -6255,36 +6253,42 @@ namespace CallCenterApi.Interface.Controllers.weixin
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        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)
+                        if (itemlast.Count > 0)
                         {
-                            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
+                            foreach (var item in itemlast)
                             {
-                                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);
+
+                                int type = Convert.ToInt32(item.F_Type);
+                                if (isApproval == 1)
+                                {
+                                    if (type == 1 || type == 3)
+                                    {
+                                        model.F_State = (int)EnumWorkOrderState.finish;
+                                    }
+                                    else if (type == 2)
+                                    {
+                                        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 = item.F_CreateUser;
+                                    if (type == 1 || type == 3)
+                                    {
+                                        model.F_State = (int)EnumWorkOrderState.receive;
+                                    }
+                                    else if (type == 2)
+                                    {
+                                        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);
+                                }
                             }
                         }
+                        else
+                            return Error("无操作权限！");
 
                         //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);

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

@@ -3465,7 +3465,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         dt.Columns.Add("超时时限");
                         dt.Columns.Add("剩余时间");
                         dt.Columns.Add("创建时间");
-                        dt.Columns.Add("完结时间");
+                        dt.Columns.Add("回访时间");
                         dt.Columns.Add("用时(天)");
                         //dt.Columns.Add("剩余时间-内线");
                         //dt.Columns.Add("超时原因");
@@ -3880,7 +3880,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             drNew["客户电话"] = it.F_CusPhone;//
                             drNew["问题描述"] = it.F_Description;//
                             drNew["创建时间"] = it.F_CreateOn;
-                            drNew["完结时间"] = it.F_VisitOn;
+                            drNew["回访时间"] = it.F_VisitOn;
 
                             drNew["事发地-省"] = it.F_IncidentProvince;//
                             drNew["事发地-市"] = it.F_IncidentCity;//
@@ -9097,9 +9097,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     //验证信息
                     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();
+                        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);                   
                         if (itemlast.Count > 0)
                         {
                             foreach (var it in itemlast)
@@ -9119,36 +9117,42 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             deptname = deptmodel.F_DeptName + "-";
                         }
-                        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)
+                        if (itemlast.Count > 0)
                         {
-                            int type = Convert.ToInt32(itemlist2.F_Type);
-                            if (isApproval == 1)
+                            foreach (var item in itemlast)
                             {
-                                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);
+
+                                int type = Convert.ToInt32(item.F_Type);
+                                if (isApproval == 1)
+                                {
+                                    if (type == 1 || type == 3)
+                                    {
+                                        model.F_State = (int)EnumWorkOrderState.finish;
+                                    }
+                                    else if (type == 2)
+                                    {
+                                        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 = item.F_CreateUser;
+                                    if (type == 1 || type == 3)
+                                    {
+                                        model.F_State = (int)EnumWorkOrderState.receive;
+                                    }
+                                    else if (type == 2)
+                                    {
+                                        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);
+                                }
                             }
                         }
+                        else
+                            return Error("无操作权限！");
 
                         //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);
@@ -9958,7 +9962,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             {
                 model.F_State = wostate;
                 model.F_State2 = wostate;
-                nn = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
+                nn = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
             }
             //var itemid = AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.evaluate, optbut, touser, 0, nowUser, model.F_limit, sms);
             if (nn > 0)
@@ -10089,7 +10093,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (isOver>=1)
             {
                 #region 处理工单
-                model.F_VisitOn = DateTime.Now;
+                //model.F_VisitOn = DateTime.Now;
                 workOrder.Update(model);
                 #endregion
                 #region 推送消息