diff --git a/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs index fc65791..363dde9 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs @@ -194,12 +194,12 @@ namespace DOAN.Admin.WebApi.Controllers //TODO 班组添加人员 [HttpGet("add_person")] - public IActionResult GroupAddPerson(string group_code, string person_id) + public IActionResult GroupAddPerson(string group_code, string person_id,DateTime schedule_date) { if (string.IsNullOrEmpty(group_code)) { return SUCCESS(null); } if (string.IsNullOrEmpty(person_id)) { return SUCCESS(null); } var response = _GroupScheduleService - .GroupAddPerson(group_code, person_id, HttpContext.GetName()); + .GroupAddPerson(group_code, person_id, schedule_date, HttpContext.GetName()); return SUCCESS(response); } diff --git a/DOAN.Model/MES/Group/Dto/GroupRelPersonGroupDto.cs b/DOAN.Model/MES/Group/Dto/GroupRelPersonGroupDto.cs index 297f6dc..d5944cd 100644 --- a/DOAN.Model/MES/Group/Dto/GroupRelPersonGroupDto.cs +++ b/DOAN.Model/MES/Group/Dto/GroupRelPersonGroupDto.cs @@ -14,6 +14,9 @@ namespace DOAN.Model.MES.group.Dto /// public class GroupRelPersonGroupDto { + + public DateTime ScheduleDate { get; set; } + [Required(ErrorMessage = "组别id不能为空")] public string GroupCode { get; set; } diff --git a/DOAN.Model/MES/Group/GroupRelPersonGroup.cs b/DOAN.Model/MES/Group/GroupRelPersonGroup.cs index bcadf78..dac7e93 100644 --- a/DOAN.Model/MES/Group/GroupRelPersonGroup.cs +++ b/DOAN.Model/MES/Group/GroupRelPersonGroup.cs @@ -7,6 +7,11 @@ namespace DOAN.Model.MES.group [SugarTable("group_rel_person_group")] public class GroupRelPersonGroup { + /// + /// 排班日期 + /// + [SugarColumn(ColumnName = "schedule_date")] + public DateTime ScheduleDate { get; set; } /// /// 组别id /// diff --git a/DOAN.Service/MES/Group/GroupScheduleService.cs b/DOAN.Service/MES/Group/GroupScheduleService.cs index 7db21a7..564e4ba 100644 --- a/DOAN.Service/MES/Group/GroupScheduleService.cs +++ b/DOAN.Service/MES/Group/GroupScheduleService.cs @@ -170,13 +170,14 @@ namespace DOAN.Service.Business .ToList(); } - public int GroupAddPerson(string group_code, string person_id, string CreatedBy) + public int GroupAddPerson(string group_code, string person_id,DateTime schedule_date, string CreatedBy) { GroupRelPersonGroup relPersonGroup = new GroupRelPersonGroup(); relPersonGroup.GroupCode = group_code; relPersonGroup.FkPersonId = person_id; relPersonGroup.CreatedTime = DateTime.Now; relPersonGroup.CreatedBy = CreatedBy; + relPersonGroup.ScheduleDate = schedule_date.Date; return Context.Insertable(relPersonGroup).ExecuteCommand(); } diff --git a/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs b/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs index 14d0f50..faae285 100644 --- a/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs +++ b/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs @@ -28,7 +28,7 @@ namespace DOAN.Service.group.IService PagedInfo SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm); List GetALLGroup(string group_code,string group_name); - int GroupAddPerson(string group_code, string person_id, string CreatedBy); + int GroupAddPerson(string group_code, string person_id,DateTime schedule_date, string CreatedBy); int GroupRemovePerson(string group_code, string person_id); List GetMonthScheduleResult(int year,int HandleMonth);