Procházet zdrojové kódy

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

lihai %!s(int64=7) %!d(string=před) roky
rodič
revize
b923a7bcd0

+ 2 - 1
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/tel/CallInScreenController.cs

611
                         //工单类型
611
                         //工单类型
612
                         model.TypeClass = gdlx;
612
                         model.TypeClass = gdlx;
613
                         //反馈内容
613
                         //反馈内容
614
-                        var detailutf8 = System.Web.HttpUtility.UrlDecode(fkcont, System.Text.Encoding.UTF8);
614
+                        //var detailutf8 = System.Web.HttpUtility.UrlDecode(fkcont, System.Text.Encoding.UTF8);
615
+                        var detailutf8 = System.Web.HttpUtility.HtmlDecode(fkcont);
615
                         model.Detail = detailutf8;
616
                         model.Detail = detailutf8;
616
                         //快递信息
617
                         //快递信息
617
                         model.Files = sendmsg;
618
                         model.Files = sendmsg;

+ 75 - 6
codegit/CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/WorkOrderController.cs

13
 {
13
 {
14
     public class WorkOrderController : BaseController
14
     public class WorkOrderController : BaseController
15
     {
15
     {
16
+        //反馈内容及处理结果 (之前是urlEncode,这个时间之后是htmlEncod,故这个时间点前后的信息处理不一样)
17
+        private string stop_datetime = "2018-07-21 10:40:00";
18
+
16
         #region 工单状态
19
         #region 工单状态
17
         public ActionResult GetWorkState()
20
         public ActionResult GetWorkState()
18
         {
21
         {
466
                         }
469
                         }
467
                         for (int i = 0; i < dt.Rows.Count; i++)
470
                         for (int i = 0; i < dt.Rows.Count; i++)
468
                         {
471
                         {
469
-                            dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
472
+                            if (Convert.ToDateTime(dt.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
473
+                            {
474
+                                //url编码解码
475
+                                //dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
476
+                                dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
477
+                            }
478
+                            else
479
+                            {
480
+                                //html编码解码
481
+                                dt.Rows[i]["Detail"] = dt.Rows[i]["Detail"].ToString();
482
+                            }
483
+                            
470
                         }
484
                         }
471
                         var obj = new
485
                         var obj = new
472
                         {
486
                         {
659
                             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];
673
                             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];
660
                             dr["CBCount"] = list.Rows.Count;
674
                             dr["CBCount"] = list.Rows.Count;
661
                         }
675
                         }
676
+                        for (int i = 0; i < dt.Rows.Count; i++)
677
+                        {
678
+                            if (Convert.ToDateTime(dt.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
679
+                            {
680
+                                //url编码解码
681
+                                //dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
682
+                                dt.Rows[i]["Detail"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["Detail"].ToString()));
683
+                            }
684
+                            else
685
+                            {
686
+                                //html编码解码
687
+                                dt.Rows[i]["Detail"] = dt.Rows[i]["Detail"].ToString();
688
+                            }
689
+                        }
662
 
690
 
663
                         var obj = new
691
                         var obj = new
664
                         {
692
                         {
905
                 var data = DbHelperSQL.Query(sql).Tables[0];
933
                 var data = DbHelperSQL.Query(sql).Tables[0];
906
                 for (int i = 0; i < data.Rows.Count; i++)
934
                 for (int i = 0; i < data.Rows.Count; i++)
907
                 {
935
                 {
908
-                    data.Rows[i]["Detail"] = WebHelper.UrlEncode(WebHelper.UrlDecode(data.Rows[i]["Detail"].ToString()));
909
-                    //data.Rows[i]["Detail"] = WebHelper.UrlDecode(WebHelper.UrlEncode(data.Rows[i]["Detail"].ToString()).Replace("+", "%20"));
936
+                    if (Convert.ToDateTime(data.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
937
+                    {
938
+                        //url编码解码
939
+                        //data.Rows[i]["Detail"] = WebHelper.UrlEncode(WebHelper.UrlDecode(data.Rows[i]["Detail"].ToString()));
940
+                        data.Rows[i]["Detail"] = WebHelper.UrlEncode(WebHelper.UrlDecode(data.Rows[i]["Detail"].ToString())).Replace("+", "%20");
941
+                    }
942
+                    else
943
+                    {
944
+                        //html编码解码
945
+                        data.Rows[i]["Detail"] = data.Rows[i]["Detail"].ToString();
946
+                    }
910
                 }
947
                 }
911
                 var item = DbHelperSQL.Query(sqlitem).Tables[0];
948
                 var item = DbHelperSQL.Query(sqlitem).Tables[0];
912
                 var obj = new
949
                 var obj = new
986
                                 if (!string.IsNullOrEmpty(fkdep))
1023
                                 if (!string.IsNullOrEmpty(fkdep))
987
                                     ordermodel.Source = fkdep;
1024
                                     ordermodel.Source = fkdep;
988
                                 if (!string.IsNullOrEmpty(detail))
1025
                                 if (!string.IsNullOrEmpty(detail))
989
-                                    ordermodel.Detail = WebHelper.UrlDecode(detail);
1026
+                                {
1027
+                                    if (Convert.ToDateTime(ordermodel.CreateTime) <= Convert.ToDateTime(stop_datetime))
1028
+                                    {
1029
+                                        //url编码解码
1030
+                                        //ordermodel.Detail = WebHelper.UrlDecode(detail);
1031
+                                        ordermodel.Detail = WebHelper.UrlDecode(detail);
1032
+                                    }
1033
+                                    else
1034
+                                    {
1035
+                                        //html编码解码
1036
+                                        ordermodel.Detail = WebHelper.HtmlDecode(detail);
1037
+                                    }
1038
+                                }
990
                                 if (!string.IsNullOrEmpty(files))
1039
                                 if (!string.IsNullOrEmpty(files))
991
                                     ordermodel.Files = files;
1040
                                     ordermodel.Files = files;
992
                                 if (!string.IsNullOrEmpty(country))
1041
                                 if (!string.IsNullOrEmpty(country))
1721
                                 model.LastDealUser = ua.F_UserCode;
1770
                                 model.LastDealUser = ua.F_UserCode;
1722
                                 model.Clcontent = cont;
1771
                                 model.Clcontent = cont;
1723
                                 //处理工单时,反馈内容可以编辑
1772
                                 //处理工单时,反馈内容可以编辑
1724
-                                model.Detail = detail;
1773
+                                if (Convert.ToDateTime(model.CreateTime) <= Convert.ToDateTime(stop_datetime))
1774
+                                {
1775
+                                    //url编码解码
1776
+                                    //model.Detail = detail;
1777
+                                    model.Detail = WebHelper.UrlDecode(detail);
1778
+                                }
1779
+                                else
1780
+                                {
1781
+                                    //html编码解码
1782
+                                    model.Detail = WebHelper.HtmlDecode(detail);
1783
+                                }
1725
                                 new BLL.T_Wo_WorkOrder().Update(model);
1784
                                 new BLL.T_Wo_WorkOrder().Update(model);
1726
 
1785
 
1727
                                 #region 消息表
1786
                                 #region 消息表
2316
                         //}
2375
                         //}
2317
                         for (int i = 0; i < dt.Rows.Count; i++)
2376
                         for (int i = 0; i < dt.Rows.Count; i++)
2318
                         {
2377
                         {
2319
-                            dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["反馈内容及处理结果"].ToString()));
2378
+                            if (Convert.ToDateTime(dt.Rows[i]["CreateTime"]) <= Convert.ToDateTime(stop_datetime))
2379
+                            {
2380
+                                //url编码解码
2381
+                                //dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["反馈内容及处理结果"].ToString()));
2382
+                                dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(WebHelper.UrlDecode(dt.Rows[i]["反馈内容及处理结果"].ToString()));
2383
+                            }
2384
+                            else
2385
+                            {
2386
+                                //html编码解码
2387
+                                dt.Rows[i]["反馈内容及处理结果"] = WebHelper.NoHtml(dt.Rows[i]["反馈内容及处理结果"].ToString());
2388
+                            }                            
2320
                         }
2389
                         }
2321
                     }
2390
                     }
2322
                 }
2391
                 }