liyuanyuan 3 gadi atpakaļ
vecāks
revīzija
40e641a901

+ 5 - 5
RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -542,7 +542,7 @@ namespace RMYY_CallCenter_Api.Controllers
542 542
             }
543 543
             if (strworkcode.Trim() != "" && strworkcode != "undefined")
544 544
             {
545
-                sql += " and F_WorkOrderCode='" + strworkcode + "'";
545
+                sql += " and F_WorkOrderCode like'%" + strworkcode + "%'";
546 546
             }
547 547
 
548 548
             if (strstarttime.Trim() != "" && strstarttime != "undefined")
@@ -575,7 +575,7 @@ namespace RMYY_CallCenter_Api.Controllers
575 575
                     sql += " and F_WorkOrderState=2";
576 576
                     break;
577 577
                 case 3:
578
-                    sql += " and F_WorkOrderState>3";
578
+                    sql += " and F_WorkOrderState>=3";
579 579
                     break;
580 580
 
581 581
             }
@@ -583,7 +583,7 @@ namespace RMYY_CallCenter_Api.Controllers
583 583
             DataTable   datatable = Bll.PagerBll.GetListPager
584 584
                                             ("T_FaultRepair_Base ",
585 585
                                               "F_WorkOrderId",
586
-                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer",
586
+                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer,[dbo].[GetUserName](F_Applicant) Applicant",
587 587
                                               sql,
588 588
                                               "order by F_WorkOrderId desc",
589 589
                                               pagesize,
@@ -772,7 +772,7 @@ namespace RMYY_CallCenter_Api.Controllers
772 772
             }
773 773
             if (strworkcode.Trim() != "" && strworkcode != "undefined")
774 774
             {
775
-                sql += " and F_WorkOrderCode='" + strworkcode + "'";
775
+                sql += " and F_WorkOrderCode like'%" + strworkcode + "%'";
776 776
             }
777 777
 
778 778
             if (strstarttime.Trim() != "" && strstarttime != "undefined")
@@ -811,7 +811,7 @@ namespace RMYY_CallCenter_Api.Controllers
811 811
             dt= Bll.PagerBll.GetListPager
812 812
                                             ("T_FaultRepair_Base ",
813 813
                                               "F_WorkOrderId",
814
-                                              "*,,[dbo].[GetUserName](F_Maintenancer) Maintenancer",
814
+                                              "*,,[dbo].[GetUserName](F_Maintenancer) Maintenancer,[dbo].[GetUserName](F_Applicant) Applicant",
815 815
                                               sql,
816 816
                                               "order by F_WorkOrderId desc",
817 817
                                               pagesize,