RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://gitee.com/doan-tech/zhuangpei-mesbackend

Browse Source
This commit is contained in:
赵正易 2024-08-09 17:06:39 +08:00
commit 6417cbd716
4 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
DOAN.Admin.WebApi/Controllers/MES/group/GroupScheduleController.cs
View File

@ -168,15 +168,15 @@ namespace DOAN.Admin.WebApi.Controllers
/// </summary>
/// <param name="group_schedule_id">班id</param>
/// <returns></returns>
[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);
}

4
DOAN.Model/MES/group/Dto/GroupScheduleDto.cs
View File

@ -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; }
}
/// <summary>
/// 排班输入输出对象

6
DOAN.Service/MES/group/GroupScheduleService.cs
View File

@ -127,7 +127,7 @@ namespace DOAN.Service.Business
/// <param name="group_schedule_id"></param>
/// <param name="date"></param>
/// <returns></returns>
public List<GroupPersonDto> SearchPerson_group_bind_No(string group_schedule_id)
public PagedInfo<GroupPersonDto> SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm)
{
// 查询日期内所有绑定人员
@ -140,12 +140,12 @@ namespace DOAN.Service.Business
.LeftJoin<GroupPerson>((rel, p) => rel.FkPersonId == p.Id)
.Where((rel, p) => p.Status == 1)
.Where((rel, p) => SqlFunc.Subqueryable<GroupSchedule>().Where(it => it.ScheduleDate == SqlFunc.Subqueryable<GroupSchedule>()
.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<GroupPost>((q, p) => q.FkPost == p.Id)
.Select((q, p) => new GroupPersonDto { PostName = p.PostName }, true)
.ToList();
.ToPage<GroupPersonDto, GroupPersonDto>(parm);
}

2
DOAN.Service/MES/group/IService/IGroupScheduleService.cs
View File

@ -22,7 +22,7 @@ namespace DOAN.Service.group.IService
PagedInfo<GroupScheduleDto> ListGroupByDate(GroupScheduleQueryDto2 query);
List<GroupPersonDto> SearchPerson_group_bind(string group_schedule_id);
List<GroupPersonDto> SearchPerson_group_bind_No(string group_schedule_id);
PagedInfo<GroupPersonDto> 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);
}