From fa11c1dfde30d7c815f9c4df7e5ecb704e009c52 Mon Sep 17 00:00:00 2001
From: "qianhao.xu" <qianhao.xu@doan-tech.com>
Date: Fri, 9 Aug 2024 17:06:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MES/group/GroupScheduleController.cs      | 8 ++++----
 DOAN.Model/MES/group/Dto/GroupScheduleDto.cs              | 4 ++++
 DOAN.Service/MES/group/GroupScheduleService.cs            | 6 +++---
 DOAN.Service/MES/group/IService/IGroupScheduleService.cs  | 2 +-
 4 files changed, 12 insertions(+), 8 deletions(-)

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