diff --git a/DOAN.Service/MES/group/GroupScheduleService.cs b/DOAN.Service/MES/group/GroupScheduleService.cs
index 694f92c..6edab38 100644
--- a/DOAN.Service/MES/group/GroupScheduleService.cs
+++ b/DOAN.Service/MES/group/GroupScheduleService.cs
@@ -104,16 +104,19 @@ namespace DOAN.Service.Business
///
///
///
- public List SearchPerson_group_bind(string group_schedule_id)
+ public List SearchPerson_group_bind(string group_schedule_id)
{
- List peopleList = Context.Queryable()
+ var query = Context.Queryable()
.LeftJoin((rel, p) => rel.FkPersonId == p.Id)
.Where((rel, p) => rel.FkGroupId == group_schedule_id)
.Where((rel, p) => p.Status == 1)
- .Select((rel, p) => p)
- .ToList();
+ .Select((rel, p) => p);
- return peopleList;
+
+ return Context.Queryable(query)
+ .LeftJoin((q, p) => q.FkPost == p.Id)
+ .Select((q, p) => new GroupPersonDto { PostName = p.PostName }, true)
+ .ToList();
}
@@ -124,26 +127,26 @@ namespace DOAN.Service.Business
///
///
///
- public List SearchPerson_group_bind_No(string group_schedule_id)
+ public List SearchPerson_group_bind_No(string group_schedule_id)
{
// 查询日期内所有绑定人员
//查询指定日期排班
-
-
-
//查询排班所有绑定的人员
-
-
// 查询排班内所有未绑定人员
- return Context.Queryable().Where(it => SqlFunc.Subqueryable()
+ var query= Context.Queryable().Where(it => SqlFunc.Subqueryable()
.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)
- .Select(it => it.ScheduleDate)).Where(it => it.Id == rel.FkGroupId).Any()).Where((rel, p) => p.Id == it.Id).NotAny()).ToList();
+ .Where(it => it.Id == 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();
+
}
diff --git a/DOAN.Service/MES/group/IService/IGroupScheduleService.cs b/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
index 8359f8a..72c2b98 100644
--- a/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
+++ b/DOAN.Service/MES/group/IService/IGroupScheduleService.cs
@@ -21,8 +21,8 @@ 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);
+ List SearchPerson_group_bind(string group_schedule_id);
+ List SearchPerson_group_bind_No(string group_schedule_id);
int GroupAddPerson(string group_schedule_id, string person_id, string CreatedBy);
int GroupRemovePerson(string group_schedule_id, string person_id);
}