diff --git a/Edu.Module.Duty/DutyPlanModule.cs b/Edu.Module.Duty/DutyPlanModule.cs index 3ea8dcd143b5275c4386a349bd50fb6ce339e7dd..0b4abadaf33fc46d784116f1bdb41be700b76850 100644 --- a/Edu.Module.Duty/DutyPlanModule.cs +++ b/Edu.Module.Duty/DutyPlanModule.cs @@ -461,13 +461,13 @@ namespace Edu.Module.Duty /// </summary> /// <param name="Id">值çç¼–å·</param> /// <param name="Shift">值ççæ¬¡</param> - /// <param name="user">用户信æ¯</param> + /// <param name="userId">用户信æ¯</param> /// <param name="isQueryWork">æ˜¯å¦æŸ¥è¯¢å·¥ä½œå†…容-TRUE(查询)</param> /// <returns></returns> - public Dictionary<string, object> OnDutyModule(int Id, int Shift, UserInfo user, bool isQueryWork = false) + public Dictionary<string, object> OnDutyModule(int Id, int Shift, int userId, bool isQueryWork = false) { Dictionary<string, object> result = new Dictionary<string, object>(); - var model = GetMyDutyPlanPageModule(1, 1, out _, new RB_Duty_Plan_ViewModel() { Id = Id, QDutyMan = user.Id.ToString(), QShift = Shift })?.FirstOrDefault(); + var model = GetMyDutyPlanPageModule(1, 1, out _, new RB_Duty_Plan_ViewModel() { Id = Id, QDutyMan = userId.ToString(), QShift = Shift })?.FirstOrDefault(); if (model == null) { return result; @@ -520,6 +520,7 @@ namespace Edu.Module.Duty result.Add("DutyManIcon", currentModel?.DutyManIcon); result.Add("Status", currentModel?.Status); result.Add("StatusStr", currentModel?.StatusStr); + result.Add("DutyMan", currentModel?.DutyMan); } else { diff --git a/Edu.WebApi/Controllers/Duty/DutyPlanController.cs b/Edu.WebApi/Controllers/Duty/DutyPlanController.cs index cc637dd2fe097c0bf303b26c7189a5242ea26804..215e49aaab2f83a0d1c2cd43ebf10c984bdef375 100644 --- a/Edu.WebApi/Controllers/Duty/DutyPlanController.cs +++ b/Edu.WebApi/Controllers/Duty/DutyPlanController.cs @@ -178,6 +178,7 @@ namespace Edu.WebApi.Controllers.Duty currentModel.ShiftName, currentModel.StartTime, currentModel.EndTime, + currentModel.DutyMan, PlanList = currentModel?.WorkContentList ?? new List<RB_Duty_PlanWork_ViewModel>(), currentModel.BurstCount, currentModel.HandoverCount, @@ -269,7 +270,13 @@ namespace Edu.WebApi.Controllers.Duty { var Id = base.ParmJObj.GetInt("Id"); var Shift = base.ParmJObj.GetInt("Shift"); - var obj = dutyPlanModule.OnDutyModule(Id, Shift, base.UserInfo); + int UserId = base.UserInfo.Id; + int DutyMan = base.ParmJObj.GetInt("DutyMan"); + if (DutyMan > 0) + { + UserId = DutyMan; + } + var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId); return ApiResult.Success(data: obj); } @@ -282,7 +289,13 @@ namespace Edu.WebApi.Controllers.Duty { var Id = base.ParmJObj.GetInt("Id"); var Shift = base.ParmJObj.GetInt("Shift"); - var obj = dutyPlanModule.OnDutyModule(Id, Shift, base.UserInfo,isQueryWork:true); + int UserId = base.UserInfo.Id; + int DutyMan = base.ParmJObj.GetInt("DutyMan"); + if (DutyMan > 0) + { + UserId = DutyMan; + } + var obj = dutyPlanModule.OnDutyModule(Id, Shift, UserId, isQueryWork:true); return ApiResult.Success(data: obj); }