|
|
@@ -550,6 +550,14 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
550
|
550
|
}
|
|
551
|
551
|
#endregion
|
|
552
|
552
|
}
|
|
|
553
|
+
|
|
|
554
|
+ else
|
|
|
555
|
+ {
|
|
|
556
|
+ if (dr["F_IsResult"].ToString() =="1")
|
|
|
557
|
+ {
|
|
|
558
|
+ dr["DeptName"] = DbHelperSQL.GetSingle(" select dbo.[GetDeptNameByUserCode](F_CreateUser) from t_bus_workorder where F_workorderid='" + dr["F_WorkOrderId"].ToString() + "'");
|
|
|
559
|
+ }
|
|
|
560
|
+ }
|
|
553
|
561
|
}
|
|
554
|
562
|
|
|
555
|
563
|
if (dr["F_LeaveRecordId"] != null && dr["F_LeaveRecordId"].ToString() != "")
|
|
|
@@ -6598,7 +6606,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
6598
|
6606
|
+ "dbo.GetDictionaryName(F_InfoConBigType) as infopropertyname, "
|
|
6599
|
6607
|
//dbo.GetDictionaryName(F_InfoConSmallType) as TypeName3,"
|
|
6600
|
6608
|
//+ "dbo.GetWorkOrderAssign(F_WorkOrderId) as DeptName,dbo.GetDictionaryName(F_InfoSource) as SourceName ,"
|
|
6601
|
|
- + "dbo.GetAreaName(F_SourceArea) as AreaName, dbo.GetDeptName(F_MainDeptId) deptname ," + "F_DeptIdIsSms = (select F_IsSms from T_Sys_Department where F_DeptId =a.F_MainDeptId)"
|
|
|
6609
|
+ + "dbo.GetAreaName(F_SourceArea) as AreaName, (case when F_IsResult =1 then dbo.[GetDeptNameByUserCode](F_CreateUser) else dbo.GetDeptNames(F_MainDeptId) end) deptname ," + "F_DeptIdIsSms = (select F_IsSms from T_Sys_Department where F_DeptId =a.F_MainDeptId)"
|
|
6602
|
6610
|
+ " from T_Bus_WorkOrder a WITH(NOLOCK) where F_WorkOrderId ='" + strworkorderid + "'" ;
|
|
6603
|
6611
|
|
|
6604
|
6612
|
var dt = DbHelperSQL.Query(sql).Tables[0];
|
|
|
@@ -7600,6 +7608,7 @@ namespace CallCenterApi.Interface.Controllers.workorder
|
|
7600
|
7608
|
modelT_Bus_WorkOrder.F_IsClosed = 1;
|
|
7601
|
7609
|
modelT_Bus_WorkOrder.F_CloseUser = userModel.F_UserCode;
|
|
7602
|
7610
|
modelT_Bus_WorkOrder.F_CloseTime = DateTime.Now;
|
|
|
7611
|
+ modelT_Bus_WorkOrder.F_MainDeptId = userModel.F_DeptId;
|
|
7603
|
7612
|
}
|
|
7604
|
7613
|
|
|
7605
|
7614
|
|