2.4.0

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/knowledge/KnowledgeController.cs

@@ -57,13 +57,13 @@ namespace CallCenterApi.Interface.Controllers.knowledge
             {
                 sql += " and F_CategoryId=" + pid.Trim();
             }
-            if (keywords != null && keywords.Trim() != "")
+                                                                                                                                                                                                 if (keywords != null && keywords.Trim() != "")
             {
                 sql += " and (F_Content like '%" + keywords.Trim() + "%' or F_Title like '%"
-                    + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
+                                                                                                                                                                                                 + keywords.Trim() + "%' or F_KeyWords like '%" + keywords.Trim() + "%')";
             }
             if (strpageindex.Trim() != "")
-            {
+            {                    
                 pageindex = Convert.ToInt32(strpageindex);
             }
 

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Controllers/workorder/AffairsController.cs

@@ -1876,6 +1876,15 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         {
                             return Error(e.ToString());
                         }
+                        Model.T_Bus_Operation oper1 = new Model.T_Bus_Operation();
+                        oper1.F_WorkOrderId = modelT_Bus_WorkOrder.F_WorkOrderId;
+                        oper1.F_State = modelT_Bus_WorkOrder.F_WorkState;
+                        string userinfo = User.F_UserName + "(" + User.F_UserCode + ")";
+                        oper1.F_Message = userinfo + " 退回了省平台工单";
+                        oper1.F_CreateUser = User.F_UserCode;
+                        oper1.F_CreateTime = DateTime.Now;
+                        oper1.F_IsDelete = 0;
+                        operBLL.Add(oper1);
                         trans.Complete();
                         return Success("操作成功");
                     }

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

@@ -1559,6 +1559,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
                     sql += " and F_DealTime<='" + dealstrendtime + "' ";
                 }
             }
+           
             switch (strtab)
             {
                 case "-1"://待处理工单(其他来源)
@@ -1655,6 +1656,12 @@ namespace CallCenterApi.Interface.Controllers.workorder
                         //sql += " and F_WorkState = '" + strstate.Trim() + "' ";
                     }
                     sql += "and F_SpotCheck=1";
+                    if (visit > -1)
+                    {
+                        sql += "and F_WorkOrderId in(select F_WorkOrderId from T_Bus_VisitResult WITH(NOLOCK) where F_Id in (select max(F_Id) from T_Bus_VisitResult WITH(NOLOCK) group by F_WorkOrderId ) and F_IsSatisfie = '"+visit +"') ";
+
+                    }
+                    else 
                     sql += "  and F_WorkOrderID in(select F_WorkOrderID from T_Bus_VisitResult WITH(NOLOCK) where F_IsDelete=0  ";
                     if (visitstarttime.Trim() != "" && visitstarttime != "undefined")
                     {

CallCenterApi/CallCenterApi.Interface/CallCenterApi.Interface/Models/Common/ButtonGroup.cs

@@ -520,8 +520,7 @@ namespace CallCenterApi.Interface.Models.Common
                             buttons.Add(Auditfailed());
                             buttons.Add(Audittransfer());
                             buttons.Add(Unsuccessful());
-                            
-
+                            buttons.Add(turnsee());
                         }
                         if (code == "ZXHWY")
                         {
@@ -531,6 +530,7 @@ namespace CallCenterApi.Interface.Models.Common
                             buttons.Add(Auditfailed());
                             buttons.Add(Audittransfer());
                             buttons.Add(Unsuccessful());
+                            buttons.Add(turnsee());
                         }
                     }
                     break;