提交

RMYY_CallCenter_Api/Controllers/FaultRepairController.cs

@@ -88,16 +88,24 @@ namespace RMYY_CallCenter_Api.Controllers
                 model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.finish;
             }
 
-          else   if (!string.IsNullOrEmpty(input.Maintenancer) && !string.IsNullOrEmpty(input.MaintenanceDept))
-            {
-                model.F_AssignTime = DateTime.Now;
-               
-                List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_ParentID=0 and F_Name='故障报修'");
-                int timeout = listgd.First().F_TimeOut;
-                model.F_Deadline = DateTime.Now.AddHours(timeout);
+            else   if ( !string.IsNullOrEmpty(input.MaintenanceDept))
+            {           
                 model.F_MaintenanceDept = input.MaintenanceDept;
-                model.F_Maintenancer = input.Maintenancer;
-                model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.receive;
+                if (!string.IsNullOrEmpty(input.Maintenancer))
+                {
+                    model.F_Maintenancer = input.Maintenancer;
+                    model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.receive;
+                    model.F_AssignTime = DateTime.Now;
+                    List<Model.T_Sys_GongDan> listgd = gdbll.GetModelList(" F_ParentID=0 and F_Name='故障报修'");
+                    int timeout = listgd.First().F_TimeOut;
+                    model.F_Deadline = DateTime.Now.AddHours(timeout);
+                }
+                else
+                {
+                    model.F_WorkOrderState = (int)EnumFaultRepairWorkOrderState.neworder;
+                }
+
+
             }
             else
             {
@@ -558,7 +566,7 @@ namespace RMYY_CallCenter_Api.Controllers
             DataTable   datatable = Bll.PagerBll.GetListPager
                                             ("T_FaultRepair_Base ",
                                               "F_WorkOrderId",
-                                              "*",
+                                              "*,[dbo].[GetUserName](F_Maintenancer) Maintenancer",
                                               sql,
                                               "order by F_WorkOrderId desc",
                                               pagesize,
@@ -776,7 +784,7 @@ namespace RMYY_CallCenter_Api.Controllers
             dt= Bll.PagerBll.GetListPager
                                             ("T_FaultRepair_Base ",
                                               "F_WorkOrderId",
-                                              "*",
+                                              "*,,[dbo].[GetUserName](F_Maintenancer) Maintenancer",
                                               sql,
                                               "order by F_WorkOrderId desc",
                                               pagesize,