反馈内容及处理结果 （之前是urlEncode，这个时间之后是htmlEncod，故这个时间点前后的信息处理不一样）

codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

@@ -611,7 +611,8 @@ namespace CallCenterApi.Interface.Controllers.tel
                         //工单类型
                         model.TypeClass = gdlx;
                         //反馈内容
-                        var detailutf8 = System.Web.HttpUtility.UrlDecode(fkcont, System.Text.Encoding.UTF8);
+                        //var detailutf8 = System.Web.HttpUtility.UrlDecode(fkcont, System.Text.Encoding.UTF8);
+                        var detailutf8 = System.Web.HttpUtility.HtmlDecode(fkcont);
                         model.Detail = detailutf8;
                         //快递信息
                         model.Files = sendmsg;

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

@@ -13,6 +13,9 @@ namespace CallCenterApi.Interface.Controllers.workorder
 {
     public class WorkOrderController : BaseController
     {
+        //反馈内容及处理结果 （之前是urlEncode，这个时间之后是htmlEncod，故这个时间点前后的信息处理不一样）
+        private string stop_datetime = "2018-07-21 10:40:00";
+
         #region 工单状态
         public ActionResult GetWorkState()
         {
@@ -466,7 +469,18 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         }
                         for (int i = 0; i < dt.Rows.Count; i++)
                         {
-                            dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
+                            if (Convert.ToDateTime(dt.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
+                            {
+                                //url编码解码
+                                //dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
+                                dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
+                            }
+                            else
+                            {
+                                //html编码解码
+                                dt.Rows[i]["Detail"] = dt.Rows[i]["Detail"].ToString();
+                            }
+                            
                         }
                         var obj = new
                         {
@@ -659,6 +673,20 @@ namespace CallCenterApi.Interface.Controllers.workorder
                             var list = new BLL.T_Wo_WorkOrderItem().GetList(" WorkOrderID='" + dr["WorkOrderID"].ToString() + "' and IsDel=0 and Type=2 and ','+ToUser+',' like ',%" + ua.F_UserCode + "%,' ").Tables[0];
                             dr["CBCount"] = list.Rows.Count;
                         }
+                        for (int i = 0; i < dt.Rows.Count; i++)
+                        {
+                            if (Convert.ToDateTime(dt.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
+                            {
+                                //url编码解码
+                                //dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
+                                dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
+                            }
+                            else
+                            {
+                                //html编码解码
+                                dt.Rows[i]["Detail"] = dt.Rows[i]["Detail"].ToString();
+                            }
+                        }
 
                         var obj = new
                         {
@@ -905,8 +933,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                 var data = DbHelperSQL.Query(sql).Tables[0];
                 for (int i = 0; i < data.Rows.Count; i++)
                 {
-                    data.Rows[i]["Detail"] = WebHelper.UrlEncode(WebHelper.UrlDecode(data.Rows[i]["Detail"].ToString()));
-                    //data.Rows[i]["Detail"] = WebHelper.UrlDecode(WebHelper.UrlEncode(data.Rows[i]["Detail"].ToString()).Replace("+", "%20"));
+                    if (Convert.ToDateTime(data.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
+                    {
+                        //url编码解码
+                        //data.Rows[i]["Detail"] = WebHelper.UrlEncode(WebHelper.UrlDecode(data.Rows[i]["Detail"].ToString()));
+                        data.Rows[i]["Detail"] = WebHelper.UrlEncode(WebHelper.UrlDecode(data.Rows[i]["Detail"].ToString())).Replace("+", "%20");
+                    }
+                    else
+                    {
+                        //html编码解码
+                        data.Rows[i]["Detail"] = data.Rows[i]["Detail"].ToString();
+                    }
                 }
                 var item = DbHelperSQL.Query(sqlitem).Tables[0];
                 var obj = new
@@ -986,7 +1023,19 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 if (!string.IsNullOrEmpty(fkdep))
                                     ordermodel.Source = fkdep;
                                 if (!string.IsNullOrEmpty(detail))
-                                    ordermodel.Detail = WebHelper.UrlDecode(detail);
+                                {
+                                    if (Convert.ToDateTime(ordermodel.CreateTime) <= Convert.ToDateTime(stop_datetime))
+                                    {
+                                        //url编码解码
+                                        //ordermodel.Detail = WebHelper.UrlDecode(detail);
+                                        ordermodel.Detail = WebHelper.UrlDecode(detail);
+                                    }
+                                    else
+                                    {
+                                        //html编码解码
+                                        ordermodel.Detail = WebHelper.HtmlDecode(detail);
+                                    }
+                                }
                                 if (!string.IsNullOrEmpty(files))
                                     ordermodel.Files = files;
                                 if (!string.IsNullOrEmpty(country))
@@ -1721,7 +1770,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                                 model.LastDealUser = ua.F_UserCode;
                                 model.Clcontent = cont;
                                 //处理工单时，反馈内容可以编辑
-                                model.Detail = detail;
+                                if (Convert.ToDateTime(model.CreateTime) <= Convert.ToDateTime(stop_datetime))
+                                {
+                                    //url编码解码
+                                    //model.Detail = detail;
+                                    model.Detail = WebHelper.UrlDecode(detail);
+                                }
+                                else
+                                {
+                                    //html编码解码
+                                    model.Detail = WebHelper.HtmlDecode(detail);
+                                }
                                 new BLL.T_Wo_WorkOrder().Update(model);
 
                                 #region 消息表
@@ -2316,7 +2375,17 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         //}
                         for (int i = 0; i < dt.Rows.Count; i++)
                         {
-                            dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["反馈内容及处理结果"].ToString()));
+                            if (Convert.ToDateTime(dt.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
+                            {
+                                //url编码解码
+                                //dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["反馈内容及处理结果"].ToString()));
+                                dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["反馈内容及处理结果"].ToString()));
+                            }
+                            else
+                            {
+                                //html编码解码
+                                dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(dt.Rows[i]["反馈内容及处理结果"].ToString());
+                            }                            
                         }
                     }
                 }