From 203babdf07dac87b4f32eb5aef915542e2ecf002 Mon Sep 17 00:00:00 2001 From: "qianhao.xu" Date: Wed, 19 Mar 2025 13:48:02 +0800 Subject: [PATCH] 1 --- .../MES/Group/GroupScheduleController.cs | 12 ++++++------ DOAN.Model/MES/Group/Dto/GroupScheduleDto.cs | 2 +- DOAN.Service/MES/Group/GroupScheduleService.cs | 18 +++++++++--------- .../Group/IService/IGroupScheduleService.cs | 2 +- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs b/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs index 9640b22..fc65791 100644 --- a/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs +++ b/DOAN.Admin.WebApi/Controllers/MES/Group/GroupScheduleController.cs @@ -160,16 +160,16 @@ namespace DOAN.Admin.WebApi.Controllers /// /// //TODO 查询班组绑定的人员 /// - /// 班组id + /// 班组id /// [HttpGet("list_person_bind")] - public IActionResult SearchPerson_group_bind(string group_schedule_id) + public IActionResult SearchPerson_group_bind(string group_code) { - if (string.IsNullOrEmpty(group_schedule_id)) + if (string.IsNullOrEmpty(group_code)) { return SUCCESS(null); } - var response = _GroupScheduleService.SearchPerson_group_bind(group_schedule_id); + var response = _GroupScheduleService.SearchPerson_group_bind(group_code); return SUCCESS(response); } @@ -178,12 +178,12 @@ namespace DOAN.Admin.WebApi.Controllers /// /// TODO 查询排班未绑定的人员 /// - /// 班id + /// 班id /// [HttpPost("list_person_bind_no")] public IActionResult SearchPerson_group_bind_No([FromBody] GroupScheduleQueryDto3 parm) { - if (string.IsNullOrEmpty(parm.group_schedule_id)) + if (string.IsNullOrEmpty(parm.group_code)) { return SUCCESS(null); } diff --git a/DOAN.Model/MES/Group/Dto/GroupScheduleDto.cs b/DOAN.Model/MES/Group/Dto/GroupScheduleDto.cs index 4832599..893b332 100644 --- a/DOAN.Model/MES/Group/Dto/GroupScheduleDto.cs +++ b/DOAN.Model/MES/Group/Dto/GroupScheduleDto.cs @@ -13,7 +13,7 @@ namespace DOAN.Model.MES.group.Dto } public class GroupScheduleQueryDto3 : PagerInfo { - public string group_schedule_id { get; set; } + public string group_code { get; set; } public string WorkNum { get; set; } public string Name { get; set; } diff --git a/DOAN.Service/MES/Group/GroupScheduleService.cs b/DOAN.Service/MES/Group/GroupScheduleService.cs index 90c2490..7db21a7 100644 --- a/DOAN.Service/MES/Group/GroupScheduleService.cs +++ b/DOAN.Service/MES/Group/GroupScheduleService.cs @@ -107,13 +107,13 @@ namespace DOAN.Service.Business /// /// 查询班组绑定的人员 /// - /// + /// /// - public List SearchPerson_group_bind(string group_schedule_id) + public List SearchPerson_group_bind(string group_code) { var query = Context.Queryable() .LeftJoin((rel, p) => rel.FkPersonId == p.Id) - .Where((rel, p) => rel.FkGroupId == group_schedule_id) + .Where((rel, p) => rel.GroupCode == group_code) .Where((rel, p) => p.Status == 1) .Select((rel, p) => p); @@ -129,7 +129,7 @@ namespace DOAN.Service.Business /// /// 查询班组未绑定的人员 /// - /// + /// /// /// public PagedInfo SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm) @@ -145,7 +145,7 @@ 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 == parm.group_schedule_id) + .Where(it => it.Id == parm.group_code) .Select(it => it.ScheduleDate)).Where(it => it.Id == rel.GroupCode).Any()).Where((rel, p) => p.Id == it.Id).NotAny()); @@ -244,7 +244,7 @@ namespace DOAN.Service.Business //TODO copy 班组人员 string[] collects = date_schedules.Select(it => it.Id).ToArray(); - List Copy_groups = Context.Queryable().Where(it => collects.Contains(it.FkGroupId)).ToList(); + List Copy_groups = Context.Queryable().Where(it => collects.Contains(it.GroupCode)).ToList(); List inserts_GroupRelPersonGroup = new List(); @@ -257,13 +257,13 @@ namespace DOAN.Service.Business group.UpdatedBy = CreatedBy; group.UpdatedTime = DateTime.Now; //组绑定 的人员 - List Copy_group_presons = Copy_groups.Where(it => it.FkGroupId == group.Id).ToList(); + List Copy_group_presons = Copy_groups.Where(it => it.GroupCode == group.Id).ToList(); if (Copy_group_presons.Count > 0) { group.Id = XueHua; foreach (var person in Copy_group_presons) { - person.FkGroupId = group.Id; + person.GroupCode = group.Id; person.CreatedBy = group.CreatedBy; person.CreatedTime = group.CreatedTime; } @@ -293,7 +293,7 @@ namespace DOAN.Service.Business { // 删除原有数据 // Context.Deleteable(date_schedules).ExecuteCommand(); - // Context.Deleteable().Where(it => collects.Contains(it.FkGroupId)).ExecuteCommand(); + // Context.Deleteable().Where(it => collects.Contains(it.GroupCode)).ExecuteCommand(); result = Context.Insertable(date_schedules).ExecuteCommand(); Context.Insertable(inserts_GroupRelPersonGroup).ExecuteCommand(); diff --git a/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs b/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs index ade9ef1..14d0f50 100644 --- a/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs +++ b/DOAN.Service/MES/Group/IService/IGroupScheduleService.cs @@ -24,7 +24,7 @@ namespace DOAN.Service.group.IService PagedInfo ListGroupByDate(GroupScheduleQueryDto2 query); - List SearchPerson_group_bind(string group_schedule_id); + List SearchPerson_group_bind(string group_code); PagedInfo SearchPerson_group_bind_No(GroupScheduleQueryDto3 parm); List GetALLGroup(string group_code,string group_name);