微信客户

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/Base/BaseController.cs

@@ -29,7 +29,7 @@ namespace CallCenterApi.Interface.Controllers.Base
         /// </summary>
         public Log FileLog
         {
-            get { return LogFactory.GetLogger(this.GetType().ToString() + "/" + this.ControllerContext.RouteData.Values["Action"].ToString()); }
+            get { return LogFactory.GetLogger(this.GetType().ToString() + "/" + this.ControllerContext?.RouteData.Values["Action"].ToString() ?? ""); }
         }
 
                 

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/SMSController.cs

@@ -29,7 +29,11 @@ namespace CallCenterApi.Interface.Controllers
         #endregion
         public ActionResult SMSSend(string name, string phone, string cusphone)
         {
-            int userId = CurrentUser.UserData.F_UserId;
+            int userId = 1545;
+            if (CurrentUser != null)
+            {
+                userId = CurrentUser.UserData.F_UserId;
+            }
             if (userId > 0)
             {
                 Model.T_Sys_UserAccount ua = sysUserAccountBll.GetModel(userId);
@@ -207,7 +211,11 @@ namespace CallCenterApi.Interface.Controllers
         }
         public ActionResult SMSSendSalesman(string name, string phone, string cusphone)
         {
-            int userId = CurrentUser.UserData.F_UserId;
+            int userId = 1545;
+            if (CurrentUser != null)
+            {
+                userId = CurrentUser.UserData.F_UserId;
+            }
             if (userId > 0)
             {
                 if (string.IsNullOrEmpty(name))

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/customer/CustomerNewController.cs

@@ -377,7 +377,8 @@ namespace CallCenterApi.Interface.Controllers.customer
         {
             if (!string.IsNullOrWhiteSpace(tel))
             {
-                string Province = "", City="";
+                string Province = "", City = "", CityaddressDes="";
+                string[] CityDes= { };
                 var model = new object();
                 var sql = $" and  F_LegalPhone  = '" + tel.Trim() + "'";
                 var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
@@ -396,7 +397,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                         {
                             try
                             {
-                                var CityDes = mobileModel.F_CityDes.Split('-');
+                                CityaddressDes = mobileModel.F_CityDes;
+                                CityDes = mobileModel.F_CityDes.Split('-');
                                 Province = CityDes[0].ToString() + "省";
                                 City = CityDes[1].ToString() + "市";
                             }
@@ -421,7 +423,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                         {
                             try
                             {
-                                var CityDes = mobileModel[0].F_TitleName.Split('-');
+                                CityaddressDes = mobileModel[0].F_TitleName;
+                                CityDes = mobileModel[0].F_TitleName.Split('-');
                                 Province = CityDes[0].ToString() ;
                                 City = CityDes[1].ToString();
                             }
@@ -442,7 +445,8 @@ namespace CallCenterApi.Interface.Controllers.customer
                 {
                     model = model,
                     Province = Province,
-                    City = City
+                    City = City,
+                    CityaddressDes = CityaddressDes
                 };
                 return Success("获取成功", obj);
                 //}
@@ -464,7 +468,11 @@ namespace CallCenterApi.Interface.Controllers.customer
         }
         public ActionResult CallAdd(CustomerBaseNewInput input)
         {
-            string usercode = CurrentUser.UserData.F_UserCode;
+            string usercode = "8000";
+            if (CurrentUser != null)
+            {
+                usercode = CurrentUser.UserData.F_UserCode;
+            }      
             if (string.IsNullOrEmpty(input.F_LegalPhone))
                 return Error("请输入客户电话");
             var sql = $" and  F_LegalPhone ='" + input.F_LegalPhone.Trim() + "'";
@@ -550,7 +558,8 @@ namespace CallCenterApi.Interface.Controllers.customer
             {
                 //Salesman = new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName + "-" + p.F_UserName + "(" + p.F_UserCode + ")",              
                 Salesman = p.F_UserName +"-"+ new BLL.T_Sys_RoleInfo().GetModel(p.F_RoleId).F_RoleName + "-" + new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName,
-                SalesPhone = p.F_Mobile
+                SalesPhone = p.F_Mobile,
+                ResponsArea=p.F_Remark
             });
             var obj = new
             {
@@ -563,6 +572,42 @@ namespace CallCenterApi.Interface.Controllers.customer
             };
             return Content(obj.ToJson());
         }
+
+        /// <summary>
+        /// 获取区县下业务员信息
+        /// </summary>
+        /// <param name="country"></param>
+        /// <returns></returns>
+        public ActionResult GetAreaSalesman(string country)
+        {
+            if (!string.IsNullOrEmpty(country))
+            {
+                string sql = $" F_DeleteFlag=0";
+                sql += $" and F_Remark like '%{ country.Trim()}%'";
+
+                var modelist = new BLL.T_Sys_UserAccount().GetModelList(sql);
+                if (modelist.Count>0)
+                {
+                    var saleslist = modelist.Where(t => !string.IsNullOrEmpty(t.F_UserCode)).Select(p => new
+                    {
+                        Salesman = p.F_UserName + "-" + new BLL.T_Sys_RoleInfo().GetModel(p.F_RoleId).F_RoleName + "-" + new BLL.T_Sys_Department().GetModel(p.F_DeptId).F_DeptName,
+                        SalesPhone = p.F_Mobile,
+                        ResponsArea = p.F_Remark
+                    });
+                    var obj = new
+                    {
+                        state = "success",
+                        message = "成功",
+                        rows = saleslist.GroupBy(x => x.Salesman).Select(y => y.First())
+                    };
+                    return Content(obj.ToJson());
+                }
+                else
+                    return Error("该区域不存在业务员信息！");
+            }
+            else
+                return Error("请选择负责区域！");
+        }
         /// <summary>
         /// 添加客户信息
         /// </summary>

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

@@ -2,6 +2,7 @@
 using CallCenterApi.DB;
 using CallCenterApi.Interface.App_Start;
 using CallCenterApi.Interface.Controllers.Base;
+using CallCenterApi.Interface.Controllers.customer;
 using CallCenterApi.Interface.Controllers.workorder;
 using CallCenterApi.Interface.Models.Enum;
 using CallCenterApi.Interface.Models.Input;
@@ -5317,7 +5318,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements) && !model.F_ZL_ImprovementRequirements.Contains(input.F_ZL_ImprovementRequirements))
             {
                 string strimprovement = str + input.F_ZL_ImprovementRequirements + ";@# ";
-                model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? strimprovement : model.F_ZL_ImprovementRequirements + strimprovement; //质量管理科-改进要求
+                //model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? strimprovement : model.F_ZL_ImprovementRequirements + strimprovement; //质量管理科-改进要求
+                model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements; //质量管理科-改进要求
             }
             if (!string.IsNullOrEmpty(input.F_ZL_CApprovalNo))
                 model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
@@ -5347,7 +5349,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
             if (!string.IsNullOrEmpty(input.F_EventReason) &&  !model.F_EventReason.Contains(input.F_EventReason))
             {
                 string strevent = str + input.F_EventReason + ";@# ";
-                model.F_EventReason = string.IsNullOrEmpty(model.F_EventReason) ? strevent : model.F_EventReason + strevent; //质量管理科-事件原因
+                //model.F_EventReason = string.IsNullOrEmpty(model.F_EventReason) ? strevent : model.F_EventReason + strevent; //质量管理科-事件原因
+                model.F_EventReason = input.F_EventReason; //质量管理科-事件原因
             }
             if (!string.IsNullOrEmpty(input.F_DrivePhone))
                 model.F_DrivePhone = input.F_DrivePhone;//电话号码
@@ -5979,14 +5982,15 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (!model.F_SuperiorOpinion.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
+                            //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
+                            model.F_SuperiorOpinion = Supercont.Trim();
                         }
                     }
                     else if (flag == 2)
                     {
                         if (!model.F_SuperiorOpinion2.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            model.F_SuperiorOpinion2 = Supercont.Trim();
                         }
                     }
                 }
@@ -7407,14 +7411,16 @@ namespace CallCenterApi.Interface.Controllers.weixin
                     {
                         if (!model.F_SuperiorOpinion.Trim().Contains(cont.Trim()))
                         {
-                            model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            //model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
+                            model.F_SuperiorOpinion = cont;
                         }
                     }
                     else if (flag == 2)
                     {
                         if (!model.F_SuperiorOpinion2.Trim().Contains(cont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            //model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            model.F_SuperiorOpinion2 = cont;
                         }
                     }
                     //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? cont : model.F_SuperiorOpinion + "； " + cont;
@@ -7857,6 +7863,231 @@ namespace CallCenterApi.Interface.Controllers.weixin
             var res = itembll.Add(itemModel);
             return res;
         }
+
+        #region 客户来电
+        public ActionResult GetCallList(string phone,int pageindex = 1, int pagesize = 10)
+        {
+            DataTable dt = new DataTable();
+            string sql = " and DealType =3";
+            //sql+= " and datediff(Minute,BeginTime,'" + DateTime.Now.ToString() + "')<=5 ";
+            if (phone != null && phone.Trim() != "")
+            {
+                sql += " and CallNumber like '%" + phone + "%'";
+            }
+            int recordCount = 0;
+            dt = BLL.PagerBLL.GetListPager(
+                "T_Call_CallRecords left join T_Sys_UserAccount on UserCode=F_UserCode",
+                "CallRecordsId",
+                "T_Call_CallRecords.*,T_Sys_UserAccount.F_SeartGroup,(SELECT F_DeptName FROM dbo.T_Sys_Department WHERE F_DeptId = T_Sys_UserAccount.F_DeptId) AS DeptName",
+                sql,
+                "ORDER BY CallRecordsId desc",
+                pagesize,
+                pageindex,
+                true,
+                out recordCount);
+
+            dt.Columns.Add("CusName");
+            dt.Columns.Add("PhoneAddress",typeof(string));
+
+            var config = new BLL.T_Sys_SystemConfig().GetModelList(" F_ParamCode='PlayPath' ").FirstOrDefault();
+            var users = new BLL.T_Sys_UserAccount().GetModelList("");
+
+            foreach (DataRow dr in dt.Rows)
+            {
+                string path = dr["FilePath"] != null ? dr["FilePath"].ToString() : "";
+                if (path != "" && config != null && !string.IsNullOrEmpty(config.F_ParamValue))
+                {
+                    var ym = config.F_ParamValue;
+                    if (ym.Substring(ym.Length - 1) == "/")
+                    {
+                        ym = ym.Substring(0, ym.Length - 1);
+                    }
+                    dr["FilePath"] = ym + path.Substring(path.IndexOf(':') + 1).Replace('\\', '/');
+                }
+                string ucode = dr["UserCode"] != null ? dr["UserCode"].ToString() : "";
+                string uname = dr["UserName"] != null ? dr["UserName"].ToString() : "";
+                string tephone = dr["CallNumber"] != null ? dr["CallNumber"].ToString() : "";
+                if (ucode != "")
+                {
+                    if (uname == "")
+                    {
+                        var uu = users.Where(u => u.F_UserCode.Equals(ucode)).FirstOrDefault();
+                        if (uu != null)
+                            dr["UserName"] = uu.F_UserName;
+                    }
+                }
+                if (!string.IsNullOrEmpty(tephone))
+                {
+                    //12:08 2020/2/27 过滤字段F_LegalPhone字段中的空格
+                    Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='" + tephone + "'  ").FirstOrDefault();
+                    Model.T_Cus_CustomerBaseNew cusll = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='0" + tephone + "'  ").FirstOrDefault();
+                    if (cus != null)
+                    {
+                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='" + tephone + "'  ").FirstOrDefault().F_Legal;
+                    }
+                    else if (cusll != null)
+                    {
+                        dr["CusName"] = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='0" + tephone + "'  ").FirstOrDefault().F_Legal;
+                    }
+
+                    var otherController = DependencyResolver.Current.GetService<CustomerNewController>();
+                    var result = ((ContentResult)otherController.GetCustomerByTel(tephone)).Content.ToObject<AjaxResult>();
+                    if (result.state.ToString() == "success")
+                    {
+                        dr["PhoneAddress"] = ((dynamic)result.data).CityaddressDes;
+                    }
+                    //object acre = JsonConvert.DeserializeObject<object>(GetActionResult(tephone).ToJson());
+                    //dr["PhoneAddress"] = ((dynamic)acre).CityaddressDes;
+                }
+
+            }
+
+            var obj = new
+            {
+                state = "success",
+                message = "成功",
+                rows = dt,
+                total = recordCount
+            };
+
+            return Content(obj.ToJson());
+
+        }
+
+        public ActionResult GetActionResult(string tel)
+        {
+            var otherController = DependencyResolver.Current.GetService<CustomerNewController>();
+            var result = otherController.GetCustomerByTel(tel);
+            return result;
+        }
+
+        #endregion
+        /// <summary>
+        /// 获取记录详情
+        /// </summary>
+        /// <param name="callid"></param>
+        /// <returns></returns>
+        public ActionResult GetCallDetail(int callid)
+        {
+            if (callid != 0)
+            {
+                var model = new BLL.T_Call_CallRecords().GetModel(callid);
+                Model.T_Cus_CustomerBaseNew cusmodel = null;
+                if (model != null)
+                {
+                    string CusName = "", PhoneAddress="";
+                    string tephone = model.CallNumber!= null ? model.CallNumber.ToString() : "";
+                    if (!string.IsNullOrEmpty(tephone))
+                    {
+                        //12:08 2020/2/27 过滤字段F_LegalPhone字段中的空格
+                        Model.T_Cus_CustomerBaseNew cus = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='" + tephone + "'  ").FirstOrDefault();
+                        Model.T_Cus_CustomerBaseNew cusll = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='0" + tephone + "'  ").FirstOrDefault();
+                        if (cus != null)
+                        {
+                            cusmodel = cus;
+                            CusName = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='" + tephone + "'  ").FirstOrDefault().F_Legal;
+                        }
+                        else if (cusll != null)
+                        {
+                            cusmodel = cusll;
+                            CusName = new BLL.T_Cus_CustomerBaseNew().GetModelList(" REPLACE(F_LegalPhone,' ','') ='0" + tephone + "'  ").FirstOrDefault().F_Legal;
+                        }
+
+                        var otherController = DependencyResolver.Current.GetService<CustomerNewController>();
+                        var result = ((ContentResult)otherController.GetCustomerByTel(tephone)).Content.ToObject<AjaxResult>();
+                        if (result.state.ToString() == "success")
+                        {
+                            PhoneAddress = ((dynamic)result.data).CityaddressDes;
+                        }
+                    }
+                    var obj = new
+                    {
+                        tephone = tephone,
+                        PhoneAddress= PhoneAddress,
+                        CusId= cusmodel?.F_CustomerId??0,
+                        CusName = CusName,
+                        Province=cusmodel?.F_AddressProvince??"",
+                        City = cusmodel?.F_AddressCity??"",
+                        Country = cusmodel?.F_AddressCountry??"",
+                        Township=cusmodel?.F_AddressTownship??""
+                    };
+                    return Content(obj.ToJson());
+                }
+                else return Error("获取失败！");
+            }
+            else
+            {
+                return Error("参数传输失败");
+            }
+        }
+        #region  客户信息添加
+        //public ActionResult CallAdd(CustomerBaseNewInput input,string OpenId)
+        //{
+        //    if (!string.IsNullOrEmpty(OpenId))
+        //    {
+        //        var otherController = DependencyResolver.Current.GetService<CustomerNewController>();
+        //        var ua = userAccountBLL.GetModelList(" F_WxOpenId='" + OpenId + "'").FirstOrDefault();
+        //        string usercode = ua.F_UserCode;
+        //        if (string.IsNullOrEmpty(input.F_LegalPhone))
+        //            return Error("请输入客户电话");
+        //        var sql = $" and  F_LegalPhone ='" + input.F_LegalPhone.Trim() + "'";
+        //        var userModel = new BLL.T_Cus_CustomerBaseNew().GetModelList(" F_IsDelete = 0 " + sql);
+        //        if (userModel.Count() > 0)
+        //        {
+        //            var model = new BLL.T_Cus_CustomerBaseNew().GetModel(userModel[0].F_CustomerId);
+        //            #region 保存客户基本信息                 
+        //            model = otherController.inputtoobj(model, input);
+        //            #endregion
+        //            bool n = new BLL.T_Cus_CustomerBaseNew().Update(model);
+        //            if (n)
+        //            {
+        //                return Success("保存成功！", model.F_CustomerId);
+        //            }
+        //            else
+        //                return Error("保存失败！");
+        //        }
+        //        else
+        //        {
+        //            int i = 0;
+        //            if (string.IsNullOrEmpty(input.F_CustomerCode))
+        //            {
+        //                while (true)
+        //                {
+        //                    if (!getunique(0, otherController.GetIntCode(i)))
+        //                    {
+        //                        input.F_CustomerCode = otherController.GetIntCode(i);
+        //                        break;
+        //                    }
+        //                    else
+        //                    {
+        //                        i++;
+        //                    }
+        //                }
+        //            }
+        //            var model = new Model.T_Cus_CustomerBaseNew();
+        //            #region 保存客户基本信息
+        //            model = otherController.inputtoobj(model, input);
+        //            model.F_CreateBy = usercode;
+        //            model.F_CreateOn = DateTime.Now;
+        //            model.F_IsDelete = 0;
+        //            #endregion
+        //            int n = new BLL.T_Cus_CustomerBaseNew().Add(model);
+        //            if (n > 0)
+        //            {
+        //                return Success("新增成功！", n);
+        //            }
+        //            else
+        //                return Error("新增失败！");
+
+        //        }
+        //    }
+        //    else
+        //    {
+        //        return Error("");
+        //    }
+
+        //}
+        #endregion
         #region
         //workorder.WoBillController blcon = new WoBillController();
         ///// <summary>
@@ -9824,4 +10055,8 @@ namespace CallCenterApi.Interface.Controllers.weixin
 
     }
     #endregion
+
+        
+
+
 }

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

@@ -9636,7 +9636,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
         /// <param name="input"></param>
         /// <returns></returns>
         [Authority]
-        public ActionResult EndOrder(long orderid, int isover = 0,int inoutflag=0)
+        public ActionResult EndOrder(long orderid, int isover = 0, int inoutflag = 0)
         {
             int userId = CurrentUser.UserData.F_UserId;
             if (userId != 0)
@@ -9649,13 +9649,25 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     if (model != null)
                     {
                         int flag = 0;
-                        var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_OptType={(int)EnumItemOpt.end} and F_WoID='{model.F_ID }' and F_WoState in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) order by F_CreateTime desc").FirstOrDefault();                    
+                        int itemflag = 0;
+                        var itemlist = itembll.GetModelList($" F_ItemType={ (int)EnumItemType.deal} and  F_OptType={(int)EnumItemOpt.end} and F_WoID='{model.F_ID }' and F_WoState in({(int)EnumWorkOrderState.finish},{(int)EnumWorkOrderState.audit}) order by F_CreateTime desc");
+                        foreach (var item in itemlist)
+                        {
+                            if (item.F_Type == 1 && model.F_State == 10)
+                                itemflag = 1;
+                            if (item.F_Type == 2 && model.F_State2 == 10)
+                                itemflag = 2;
+                        }
                         if (isover == 1)
                         {
                             if (inoutflag > 0)
                                 flag = inoutflag;
                             else
-                                flag = Convert.ToInt32(itemlist.F_Type);
+                            {
+                                if (itemflag == 0)
+                                    return Error("完结失败！");
+                                flag = itemflag;
+                            }
                         }
 
                         var res = Overorder(ua, model, isover, flag);
@@ -10465,15 +10477,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         if (!model.F_SuperiorOpinion.Trim().Contains(cont.Trim()))
                         {
                             //model.F_SuperiorOpinion = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
-                            model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
+                            //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
+                            model.F_SuperiorOpinion =  cont;
                         }
                     }
                     else if (flag == 2)
                     {
                         if (!model.F_SuperiorOpinion2.Trim().Contains(cont.Trim()))
                         {
-                            //model.F_SuperiorOpinion2 = nowUser.F_UserName + "(" + nowUser.F_WorkNumber + ") " + DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss") + " " + cont;
-                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            model.F_SuperiorOpinion2 = cont;
+                            //model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
                         }
                     }                 
                 }
@@ -10688,8 +10701,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (!string.IsNullOrEmpty(input.F_ZL_ImprovementRequirements) && !model.F_ZL_ImprovementRequirements.Contains(input.F_ZL_ImprovementRequirements) )
             {
                string  strimprovement = str + input.F_ZL_ImprovementRequirements + ";@# ";
-                model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? strimprovement : model.F_ZL_ImprovementRequirements + strimprovement; //质量管理科-改进要求
-                //model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
+                //model.F_ZL_ImprovementRequirements = string.IsNullOrEmpty(model.F_ZL_ImprovementRequirements) ? strimprovement : model.F_ZL_ImprovementRequirements + strimprovement; //质量管理科-改进要求
+                model.F_ZL_ImprovementRequirements = input.F_ZL_ImprovementRequirements;//质量管理科-改进要求
             }
             if (!string.IsNullOrEmpty(input.F_ZL_CApprovalNo))
                 model.F_ZL_CApprovalNo = input.F_ZL_CApprovalNo;//质量管理科-对应审批工作流单号
@@ -10722,7 +10735,8 @@ namespace CallCenterApi.Interface.Controllers.workorder
             if (!string.IsNullOrEmpty(input.F_EventReason) && !model.F_EventReason.Contains(input.F_EventReason))
             {
                 string strevent = str + input.F_EventReason + ";@# ";
-                model.F_EventReason = string.IsNullOrEmpty(model.F_EventReason) ? strevent : model.F_EventReason + strevent; //质量管理科-事件原因
+                //model.F_EventReason = string.IsNullOrEmpty(model.F_EventReason) ? strevent : model.F_EventReason + strevent; //质量管理科-事件原因
+                model.F_EventReason = input.F_EventReason; //质量管理科-事件原因
             }
             if (!string.IsNullOrEmpty(input.F_DrivePhone))
                 model.F_DrivePhone = input.F_DrivePhone;//电话号码
@@ -10956,14 +10970,16 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     {
                         if (!model.F_SuperiorOpinion.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
+                            //model.F_SuperiorOpinion = string.IsNullOrEmpty(model.F_SuperiorOpinion) ? strconts1 : model.F_SuperiorOpinion + strconts1;
+                            model.F_SuperiorOpinion = Supercont;
                         }
                     }
                     else if (flag == 2)
                     {
                         if (!model.F_SuperiorOpinion2.Trim().Contains(Supercont.Trim()))
                         {
-                            model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            //model.F_SuperiorOpinion2 = string.IsNullOrEmpty(model.F_SuperiorOpinion2) ? strconts1 : model.F_SuperiorOpinion2 + strconts1;
+                            model.F_SuperiorOpinion2 = Supercont;
                         }
                     }