diff --git a/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
index 0ca4bd0..7c5aecb 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
@@ -168,15 +168,15 @@ namespace DOAN.Admin.WebApi.Controllers
///
/// 班id
///
- [HttpGet("list_person_bind_no")]
- public IActionResult SearchPerson_group_bind_No(string group_schedule_id)
+ [HttpPost("list_person_bind_no")]
+ public IActionResult SearchPerson_group_bind_No([FromBody] GroupScheduleQueryDto3 parm)
{
- if (string.IsNullOrEmpty(group_schedule_id))
+ if (string.IsNullOrEmpty(parm.group_schedule_id))
{
return SUCCESS(null);
}
- var response = _GroupScheduleService.SearchPerson_group_bind_No(group_schedule_id);
+ var response = _GroupScheduleService.SearchPerson_group_bind_No(parm);
return SUCCESS(response);
}
diff --git a/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs b/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
index 4ce4725..5da58c3 100644
--- a/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
+++ b/DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
@@ -12,6 +12,10 @@ namespace DOAN.Model.MES.group.Dto
{
public DateTime ScheduleDate { get; set; }
}
+ public class GroupScheduleQueryDto3 : PagerInfo
+ {
+ public string group_schedule_id { get; set; }
+ }
///
/// 排班输入输出对象
diff --git a/DOAN.Service/MES/group/GroupScheduleService.cs b/DOAN.Service/MES/group/GroupScheduleService.cs
index 6edab38..5f17580 100644
--- a/DOAN.Service/MES/group/GroupScheduleService.cs
+++ b/DOAN.Service/MES/group/GroupScheduleService.cs
@@ -127,7 +127,7 @@ namespace DOAN.Service.Business
///
///
///
- public List SearchPerson_group_bind_No(string group_schedule_id)
+ public PagedInfo SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm)
{
// 查询日期内所有绑定人员
@@ -140,12 +140,12 @@ namespace DOAN.Service.Business
.LeftJoin((rel, p) => rel.FkPersonId == p.Id)
.Where((rel, p) => p.Status == 1)
.Where((rel, p) => SqlFunc.Subqueryable().Where(it => it.ScheduleDate == SqlFunc.Subqueryable()
- .Where(it => it.Id == group_schedule_id)
+ .Where(it => it.Id == parm.group_schedule_id)
.Select(it => it.ScheduleDate)).Where(it => it.Id == rel.FkGroupId).Any()).Where((rel, p) => p.Id == it.Id).NotAny());
return Context.Queryable(query)
.LeftJoin((q, p) => q.FkPost == p.Id)
.Select((q, p) => new GroupPersonDto { PostName = p.PostName }, true)
- .ToList();
+ .ToPage(parm);
}
diff --git a/DOAN.Service/MES/group/IService/IGroupScheduleService.cs b/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
index 72c2b98..451c224 100644
--- a/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
+++ b/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
@@ -22,7 +22,7 @@ namespace DOAN.Service.group.IService
PagedInfo ListGroupByDate(GroupScheduleQueryDto2 query);
List SearchPerson_group_bind(string group_schedule_id);
- List SearchPerson_group_bind_No(string group_schedule_id);
+ PagedInfo SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm);
int GroupAddPerson(string group_schedule_id, string person_id, string CreatedBy);
int GroupRemovePerson(string group_schedule_id, string person_id);
}