提交分支

codegit/CallCenterApi/CallCenterApi.DAL/T_Wo_WorkOrder.cs

@@ -157,7 +157,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_MaterialFee", SqlDbType.Decimal,9),
                     new SqlParameter("@F_Formula", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_ReturnQuantity", SqlDbType.Int,4),
-                    new SqlParameter("@F_EventReason", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_EventReason", SqlDbType.NText),
                     new SqlParameter("@F_MailingNumber", SqlDbType.VarChar,20),
                     new SqlParameter("@F_ExpressName", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_DealContent2", SqlDbType.NText),
@@ -175,7 +175,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SuperiorOpinion", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_DrivePhone", SqlDbType.VarChar,20),
                     new SqlParameter("@F_SuperiorOpinion2", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_EventReason2", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_EventReason2", SqlDbType.NText),
                     new SqlParameter("@F_Flag", SqlDbType.Int,4)
             };
             parameters[0].Value = model.F_WorkOrderCode;
@@ -532,7 +532,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_MaterialFee", SqlDbType.Decimal,9),
                     new SqlParameter("@F_Formula", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_ReturnQuantity", SqlDbType.Int,4),
-                    new SqlParameter("@F_EventReason", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_EventReason", SqlDbType.NText),
                     new SqlParameter("@F_MailingNumber", SqlDbType.VarChar,20),
                     new SqlParameter("@F_ExpressName", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_DealContent2", SqlDbType.NText),
@@ -550,7 +550,7 @@ namespace CallCenterApi.DAL
                     new SqlParameter("@F_SuperiorOpinion", SqlDbType.NVarChar,200),
                     new SqlParameter("@F_DrivePhone", SqlDbType.VarChar,20),
                     new SqlParameter("@F_SuperiorOpinion2", SqlDbType.NVarChar,200),
-                    new SqlParameter("@F_EventReason2", SqlDbType.NVarChar,200),
+                    new SqlParameter("@F_EventReason2", SqlDbType.NText),
                     new SqlParameter("@F_Flag", SqlDbType.Int,4),
                     new SqlParameter("@F_ID", SqlDbType.Int,4)};
             parameters[0].Value = model.F_WorkOrderCode;

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

@@ -20,6 +20,8 @@ namespace CallCenterApi.Interface.Controllers
         // GET: Home
         public ActionResult Index()
         {
+            //string str = "羽羽(111111) 2022-07-19 10:52:51  外线结果";
+            //string sql = str.Substring(str.IndexOf(":") + 6);
             return Success("成功");
         }
         [Authorize]

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

@@ -20,6 +20,7 @@ using System.Net;
 using System.Security.Cryptography;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Script.Serialization;
@@ -1851,11 +1852,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string uwhere = " ";
                 string sql = "";
-                if (!Refresh() || !Refresh2())
-                {
-                    return Error("查询失败");
-                }
-                int  YCD = 0, DJD = 0, DCL = 0, DSP = 0, YCL = 0, GCDBL = 0, YBL = 0, CQGD = 0,  TD = 0,YFP=0, ZHCX = 0, CSGD=0;
+            //if (!Refresh())
+            //{
+            //    return Error("查询失败");
+            //}
+            Task.Run(() => Refresh());
+            int  YCD = 0, DJD = 0, DCL = 0, DSP = 0, YCL = 0, GCDBL = 0, YBL = 0, CQGD = 0,  TD = 0,YFP=0, ZHCX = 0, CSGD=0;
                 for (int i = 0; i <= 9; i++)
                 {
                
@@ -5204,7 +5206,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <returns></returns>
         [WechatActionFilter]
         public ActionResult AssignWorkOrder(string OpenId, long orderid, string cont, WorkOrdeDeptment deptment, string F_Files, int isvisit = 1,
-            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="", int flag = 1,int inoutflag = 0)
+            int overtime = 0, int sms = -1, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="", int flag = 1,int inoutflag = 0, string Supercont = "")
         {
 
             if (!string.IsNullOrEmpty(OpenId))
@@ -5271,6 +5273,12 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         return Error("请选择接收部门");
                     }
+                    #region 五要素
+                    input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
+                    input.F_EventReason = deptment.EventReason;// 事件原因
+                    input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;// 改进要求
+                    input.F_TS_Level = deptment.TS_Level;//投诉-重要级别：轻微、一般、较大、重大
+                    #endregion
                     if (markdepts.Contains(ua.F_DeptId.ToString()) && model.F_Flag == 9)
                     {
                         if (markdepts.Contains(ua.F_DeptId.ToString()))
@@ -5296,7 +5304,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                                 return Error("请选择接收部门");
 
                             }
-                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag);
+                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag,Supercont);
                             var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
 
                         }
@@ -5306,7 +5314,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             {
                                 return Error("请选择接收部门");
                             }
-                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag);
+                            var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2, flag,Supercont);
                             Overorder(ua, model, 1);
                         }
                         else
@@ -5315,7 +5323,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             {
                                 return Error("请选择接收部门");
                             }
-                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag);
+                            var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 1, flag, Supercont);
                             Overorder(ua, model, 2);
                         }
                         return Success("转派成功");
@@ -5490,7 +5498,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
                             if (modeldpts != null)
                                 return Error("不允许同一个部门出现在两条线内,请重新指派！");
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(zflag));
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(zflag),0, Supercont);
                         if (res)
                         {
                             return Success("转派成功");
@@ -5566,7 +5574,7 @@ namespace CallCenterApi.Interface.Controllers.weixin
         /// <summary>
         /// 转派工单
         /// </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, int flag = 1, int flagstate = 0)
+        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, int flag = 1, int flagstate = 0, string Supercont = "")
         {
 
             if (model.F_limit > 0)
@@ -5742,6 +5750,24 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         model.F_DealContent += cont + "；";
                     }
+                if (!string.IsNullOrEmpty(Supercont))
+                {
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
+                    {
+                        if (model.F_SuperiorOpinion.Trim() != Supercont.Trim())
+                        {
+                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                        }
+                    }
+                    else if (flag == 2)
+                    {
+                        if (model.F_SuperiorOpinion2.Trim() != Supercont.Trim())
+                        {
+                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                        }
+                    }
+
+                }
                 InToworkModel(model, input);
 
                 if (!string.IsNullOrEmpty(F_Files))
@@ -5825,10 +5851,11 @@ namespace CallCenterApi.Interface.Controllers.weixin
                {
                 return Success("你的账号已在别处登录，你确定要再次登录吗？");
             }
-                if (!Refresh() || !Refresh2())
-                {
-                    return Error("查询失败");
-                }
+                //if (!Refresh())
+                //{
+                //    return Error("查询失败");
+                //}
+                Task.Run(() => Refresh());
                 string sql = $" and F_IsDelete=0";
               //  sql += "and F_Type !=3";
                 DataTable dt = new DataTable();
@@ -7079,11 +7106,17 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     }
                     if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
-                        model.F_SuperiorOpinion = cont;
+                        if (model.F_SuperiorOpinion.Trim() != cont.Trim())
+                        {
+                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                        }
                     }
                     else if (flag == 2)
                     {
-                        model.F_SuperiorOpinion2 = cont;
+                        if (model.F_SuperiorOpinion2.Trim() != cont.Trim())
+                        {
+                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                        }
                     }
                     //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? cont : model.F_SuperiorOpinion + "； " + cont;
                 }

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

@@ -163,6 +163,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_Type='" + EnumWOType.ConsultingNeeds.ToString() + "'";
             if (type == (int)EnumWOType.SpotCheck)//抽检
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
+            if (type == (int)EnumWOType.Cooperation)//业务协办
+                sql += " and F_Type='" + EnumWOType.Cooperation.ToString() + "'";
             int recordCount = 0;
 
          
@@ -238,6 +240,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 sql += " and F_Type='" + EnumWOType.ConsultingNeeds.ToString() + "'";
             if (type == (int)EnumWOType.SpotCheck)//抽检
                 sql += " and F_Type='" + EnumWOType.SpotCheck.ToString() + "'";
+            if (type == (int)EnumWOType.Cooperation)//业务协办
+                sql += " and F_Type='" + EnumWOType.Cooperation.ToString() + "'";
             int recordCount = 0;
             if (pid == 0 && type == (int)EnumWOType.Complaint)
             {

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

@@ -15,6 +15,7 @@ using System.Globalization;
 using System.IO;
 using System.Linq;
 using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using System.Web;
 using System.Web.Mvc;
 using System.Web.Script.Serialization;
@@ -661,10 +662,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 Model.T_Sys_RoleInfo ro = rolebll.GetModel(ua.F_RoleId);
                 string uwhere = " ";
                 string sql = "";
-                if (!Refresh())
-                {
-                    return Error("查询失败");
-                }
+                //if (!Refresh())
+                //{
+                //    return Error("查询失败");
+                //}
+                Task.Run(() => Refresh());
                 int DZP = 0, YCD = 0, DJD = 0, DCL = 0, YQGD = 0, YZP = 0, DSP = 0, YCL = 0, GCDBL = 0, YBL = 0, WSP =
                     0, YGGD = 0, KHFK = 0, CQGD = 0, CBGD = 0, TD = 0, ZHCX = 0, RV_awaitVist = 0, RV_haveVisit = 0, RV_resultVisit = 0, DWJ = 0, ZHHF = 0,CSGD=0; ;
                 for (int i = 0; i <= 21; i++)
@@ -3326,9 +3328,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dt.Columns.Add("问题数量");
                             dt.Columns.Add("销售基地");                                       
                             dt.Columns.Add("生产批次号");
-                            dt.Columns.Add("问题类别1");
-                            dt.Columns.Add("问题类别2");
-                            dt.Columns.Add("问题类别3");
+                            if (type == 5)
+                            {
+                                dt.Columns.Add("问题类别");
+                            }
+                            else
+                            {
+                                dt.Columns.Add("问题类别1");
+                                dt.Columns.Add("问题类别2");
+                                dt.Columns.Add("问题类别3");
+                            }
                             dt.Columns.Add("重要级别");
                             dt.Columns.Add("品牌");
                             dt.Columns.Add("客户编号");
@@ -3641,19 +3650,33 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         Model.T_Wo_QuestionManage manage = quesBLL.GetModel(b);
                                         if (manage != null)
                                         {
-                                            drNew["问题类别3"] = manage.F_QuestionName;
-                                            if (manage.F_Label == "3")
+                                            if (type == 5)
                                             {
-                                                Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
-                                                Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
-                                                drNew["问题类别1"] = Manage2.F_QuestionName;//问题类别1
-                                                drNew["问题类别2"] = Manage1.F_QuestionName;//问题类别2
+                                                drNew["问题类别"] = manage.F_QuestionName;
+                                            }
+                                            else
+                                            {
+                                                drNew["问题类别3"] = manage.F_QuestionName;
+                                                if (manage.F_Label == "3")
+                                                {
+                                                    Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
+                                                    Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
+                                                    drNew["问题类别1"] = Manage2.F_QuestionName;//问题类别1
+                                                    drNew["问题类别2"] = Manage1.F_QuestionName;//问题类别2
+                                                }
                                             }
                                         }
                                     }
                                     catch (Exception)
                                     {
-                                        drNew["问题类别3"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                                        if (type == 5)
+                                        {
+                                            drNew["问题类别"] = it.F_QuestionType;
+                                        }
+                                        else
+                                        {
+                                            drNew["问题类别3"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                                        }
                                     }
                                 }
                                 drNew["重要级别"] = it.F_TS_Level;
@@ -3947,10 +3970,11 @@ namespace CallCenterApi.Interface.Controllers.workorder
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
             {
-                if (!Refresh())
-                {
-                    return Error("查询失败");
-                }
+                //if (!Refresh())
+                //{
+                //    return Error("查询失败");
+                //}
+                Task.Run(() => Refresh());
                 string sql = $" and F_IsDelete=0";
                 //   sql += "and F_Type !=3";
                 DataTable dt = new DataTable();
@@ -4104,9 +4128,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             dt.Columns.Add("问题数量");
                             dt.Columns.Add("销售基地");
                             dt.Columns.Add("生产批次号");
-                            dt.Columns.Add("问题类别1");
-                            dt.Columns.Add("问题类别2");
-                            dt.Columns.Add("问题类别3");
+                            if (type == 5)
+                            {
+                                dt.Columns.Add("问题类别");
+                            }
+                            else
+                            {
+                                dt.Columns.Add("问题类别1");
+                                dt.Columns.Add("问题类别2");
+                                dt.Columns.Add("问题类别3");
+                            }
                             dt.Columns.Add("重要级别");
                             dt.Columns.Add("品牌");
                             dt.Columns.Add("客户编号");
@@ -4398,19 +4429,33 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                         Model.T_Wo_QuestionManage manage = quesBLL.GetModel(b);
                                         if (manage != null)
                                         {
-                                            drNew["问题类别3"] = manage.F_QuestionName;
-                                            if (manage.F_Label == "3")
+                                            if (type == 5)
                                             {
-                                                Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
-                                                Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
-                                                drNew["问题类别1"] = Manage2.F_QuestionName;//问题类别1
-                                                drNew["问题类别2"] = Manage1.F_QuestionName;//问题类别2
+                                                drNew["问题类别"] = manage.F_QuestionName;
+                                            }
+                                            else
+                                            {
+                                                drNew["问题类别3"] = manage.F_QuestionName;
+                                                if (manage.F_Label == "3")
+                                                {
+                                                    Model.T_Wo_QuestionManage Manage1 = quesBLL.GetModel(int.Parse(manage.F_ParentId.ToString()));//获取问题类别
+                                                    Model.T_Wo_QuestionManage Manage2 = quesBLL.GetModel(int.Parse(Manage1.F_ParentId.ToString()));//获取问题类别
+                                                    drNew["问题类别1"] = Manage2.F_QuestionName;//问题类别1
+                                                    drNew["问题类别2"] = Manage1.F_QuestionName;//问题类别2
+                                                }
                                             }
                                         }
                                     }
                                     catch (Exception)
                                     {
-                                        drNew["问题类别3"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                                        if (type == 5)
+                                        {
+                                            drNew["问题类别"] = it.F_QuestionType;
+                                        }
+                                        else
+                                        {
+                                            drNew["问题类别3"] = it.F_QuestionType; //问题类别（投诉抽捡和咨询类别不一样）
+                                        }
                                     }
                                 }
                                 drNew["重要级别"] = it.F_TS_Level;
@@ -6578,7 +6623,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     model.F_DealType = model1[i].F_DealType;//处理方式:当即办理、电话转接、网络转办（点选）
                     model.F_WorkerBrand = model1[i].F_Brand;//工单品牌
                     //model.SuperiorOpinion = AssCont(model1[i].F_ID);//上级处理意见
-                    model.SuperiorOpinion = model1[i].F_SuperiorOpinion;//处理结果-外线
+                    model.SuperiorOpinion = model1[i].F_SuperiorOpinion;
                     model.SuperiorOpinion2 = model1[i].F_SuperiorOpinion2;//处理结果-内线
                     #endregion
                     if (!string.IsNullOrEmpty(model1[i].F_QuestionType))
@@ -8371,7 +8416,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <returns></returns>
         [Authority]
         public ActionResult AssignWorkOrder(long orderid, string cont, WorkOrdeDeptment deptment, string F_Files,
-            int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=1,int inoutflag = 0)
+            int overtime = 0, int sms = 0, int clbm = 0, int clid = 0, int isApprovalp = 0, int hclbm = 0, int hclid = 0, int clbm2 = 0, int clid2 = 0,string jsonstr="",int flag=1,int inoutflag = 0,string Supercont="")
         {
             int userId = CurrentUser.UserData.F_UserId;
             string usercode = CurrentUser.UserData.F_UserCode;
@@ -8455,6 +8500,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 {
                     return Error("请选择接收部门");
                 }
+                #region 五要素
+                input.F_ZL_ResponsibleUnit = deptment.ResponsibleUnit;// 责任单位
+                input.F_EventReason = deptment.EventReason;// 事件原因
+                input.F_ZL_ImprovementRequirements = deptment.ImprovementRequirements;// 改进要求
+                input.F_TS_Level = deptment.TS_Level;//投诉-重要级别：轻微、一般、较大、重大
+                #endregion
                 if ((model.F_State==17 & model.F_State2==17)|| (model.F_State == 0 & model.F_State2 == 0)||(model.F_State == 3 & model.F_State2 == 3) || (markdepts.Contains(ua.F_DeptId.ToString()) && model.F_Flag==9))
                 {
                     if (markdepts.Contains(ua.F_DeptId.ToString()))
@@ -8480,7 +8531,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             return Error("请选择接收部门");
 
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);
                         var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
 
                     }
@@ -8490,7 +8541,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             return Error("请选择接收部门");
                         }
-                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag);
+                        var res1 = AssignWO(ua, model, input, cont, F_Files, clbm2, clid2, overtime, sms, isApprovalp, hclbm, hclid, "", 0, 2,flag,Supercont);
                         Overorder(ua, model,2,1);
                         //DealWO(ua, model, input, "", "", 1, "", 1, "",flag);
                     }
@@ -8500,7 +8551,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             return Error("请选择接收部门");
                         }
-                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag);
+                        var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid,"",0,1,flag,Supercont);
                         Overorder(ua, model,2,2);
                         //DealWO(ua, model, input, "", "", 1, "", 2, "",flag);
                     }
@@ -8694,7 +8745,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     //var itemlast = itembll.GetModelList(" F_ItemType=" + (int)EnumItemType.deal + " and F_IsUsed=0 and F_WoState =2 and  F_WoID='" + model.F_ID + "'and F_NextUser like '%" + ua.F_UserCode + "%' order by F_ID desc").FirstOrDefault();
 
-                    var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(zflag));
+                    var res = AssignWO(ua, model, input, cont, F_Files, clbm, clid, overtime, sms, isApprovalp, hclbm, hclid, "", 0, Convert.ToInt32(zflag),0,Supercont);
                     if (res)
                     {
                         return Success("转派成功");
@@ -9902,16 +9953,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (flag == 1)
             {
                 model.F_State = wostate;//外线关闭
-                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 1);
+                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit, sms, "", 0, 1);
             }
             else if (flag == 2)
             {
                 model.F_State2 = wostate;//内线关闭
-                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms, "", 0, 2);
+                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit, sms, "", 0, 2);
             }
             else
             {
-                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, touser, 0, nowUser, model.F_limit, sms);
+                AddLog((int)model.F_ID, wostate, content, (int)EnumItemType.deal, optbut, "", 0, nowUser, model.F_limit, sms);
                 model.F_State = wostate;
                 model.F_State2 = wostate;
             }
@@ -10068,11 +10119,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     }
                     if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
                     {
-                        model.F_SuperiorOpinion = cont;
+                        if (model.F_SuperiorOpinion.Trim() != cont.Trim())
+                        {
+                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                        }
                     }
                     else if (flag == 2)
                     {
-                        model.F_SuperiorOpinion2= cont;
+                        if (model.F_SuperiorOpinion2.Trim() != cont.Trim())
+                        {
+                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                        }
                     }                 
                 }
                 //if (!string.IsNullOrEmpty(eventreason))
@@ -10359,7 +10416,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <summary>
         /// 转派工单
         /// </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, int flag = 1,int flagstate=0)
+        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, int flag = 1,int flagstate=0,string Supercont="")
         {
             #region 系统升级派单时限可修改2021/12/24
             //if (model.F_limit > 0)
@@ -10538,6 +10595,24 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         model.F_DealContent += cont + "；";
                     }
+                if (!string.IsNullOrEmpty(Supercont))
+                {
+                    if (flag == 1 || ((model.F_Flag == null || model.F_Flag == 0) && flag == 3))
+                    {
+                        if (model.F_SuperiorOpinion.Trim() != Supercont.Trim())
+                        {
+                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                        }
+                    }
+                    else if (flag == 2)
+                    {
+                        if (model.F_SuperiorOpinion2.Trim() != Supercont.Trim())
+                        {
+                            model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + Supercont;
+                        }
+                    }
+
+                }
                 InToworkModel(model, input);
 
                 if (!string.IsNullOrEmpty(F_Files))

codegit/CallCenterApi/CallCenterApi.Model/T_Wo_WorkOrder.cs

@@ -1093,7 +1093,12 @@ namespace CallCenterApi.Model
         /// 其他
         /// </summary>
         [Description("其他")]
-        Other
+        Other,
+        /// <summary>
+        /// 业务协办
+        /// </summary>    
+        [Description("业务协办")]
+        Cooperation
     }
 }