1550076451 il y a 3 ans
Parent
commit
2c3e58cba4

+ 3 - 3
RMYY_CallCenter_Api/Common/WorkOrderBase.cs

@@ -456,7 +456,7 @@ namespace RMYY_CallCenter_Api
456 456
             }
457 457
             else if (type == 1000)
458 458
             {
459
-                typeIdArray = new List<int> { 0, 1, 1, 2, -1, 10, -1, -1,3,4,7 };
459
+                typeIdArray = new List<int> { 0, 0, 1, 2, -1, 10, -1, -1,3,4,7 };
460 460
             }
461 461
             else if (type == 2000)
462 462
             {
@@ -483,12 +483,12 @@ namespace RMYY_CallCenter_Api
483 483
                     if (type ==4000)
484 484
                         strArr = new List<string> { "待提交","待分配", "待接单", "已接单","处理中", "待评价", "已完成"}; 
485 485
                     else 
486
-                    strArr = new List<string> { "待提交", "待单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单","已退回","办理中","待回访" }; break;
486
+                    strArr = new List<string> { "待提交", "待单", "待接单", "已接单", "待评价", "已完成", "已完成","已接单","已退回","办理中","待回访" }; break;
487 487
                 case MENUENUM.工单列表:
488 488
                     if(type==3000)
489 489
                         strArr = new List<string> { "待提交", "待派单", "待查收", "待完成", "已处理", "异常完结", "已完结", "待完成" };
490 490
                     else
491
-                    strArr = new List<string> { "待提交", "待派", "待接单", "待完成", "已处理", "已完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
491
+                    strArr = new List<string> { "待提交", "待派", "待接单", "待完成", "已处理", "已完成", "已完成", "已接单", "已退回", "办理中", "待回访" }; break;
492 492
                 case MENUENUM.报修列表:
493 493
                     strArr = new List<string> { "待提交", "-", "待接单", "待完成", "已完成", "已完成", "已完成", "已接单" }; break;
494 494
                 case MENUENUM.调度工单列表:

+ 2 - 6
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_MessageController.cs

@@ -53,8 +53,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
53 53
                 item.F_CarTypeName = date.Rows[i]["F_CarTypeName"].ToString();
54 54
                 i++;
55 55
             }
56
-            if (carlist.Count > 0)
57
-            {
56
+        
58 57
                 var obj = new
59 58
                 {
60 59
                     state = "success",
@@ -63,10 +62,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
63 62
                     total = recordCount
64 63
                 };
65 64
                 return Content(obj.ToJson());
66
-            }
67
-            else
68
-                return Error("暂无记录!");
69
-
65
+           
70 66
         }
71 67
 
72 68
         /// <summary>

+ 5 - 1
RMYY_CallCenter_Api/Controllers/CarManage/T_Car_WorkOrderController.cs

@@ -189,7 +189,7 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
189 189
                     sql += $" and   F_CreateUser= '{User.F_UserCode}'";
190 190
                 }
191 191
                 if (WorkOrderCode.Trim() != "" && WorkOrderCode != "undefined")
192
-                    sql += $" and F_WorkOrderID like '%{WorkOrderCode}%'";
192
+                    sql += $" and (F_WorkOrderID like '%{WorkOrderCode}%' or F_WorkOrderCode like '%{WorkOrderCode}%')";
193 193
                 sql += "and F_IsDelete=0";
194 194
                 int recordCount = 0;
195 195
                 string where = "";
@@ -524,6 +524,10 @@ namespace RMYY_CallCenter_Api.Controllers.CarManage
524 524
                 case 1://工单流程
525 525
                       var modellist = new BLL.T_Car_Operation().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
526 526
                         return Success("获取成功", modellist);
527
+                case 2://评价详情
528
+                    var Evaluate = new BLL.T_Car_Evaluate().GetModelList($"F_WorkOrderCode='{WorkOrderCode}'");
529
+                    return Success("获取成功", Evaluate);
530
+                    
527 531
                 case 3://司机工单
528 532
                     if (orderid <= 0)
529 533
                         return Error("请选择工单");