删除 Group 保留 Groups

OASystem/OASystem.Api/Controllers/GroupController.cs

@@ -1,96 +0,0 @@
-using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
-using OASystem.Domain.Dtos.Group;
-using OASystem.Domain.Dtos.System;
-using OASystem.Infrastructure.Repositories.Group;
-
-namespace OASystem.API.Controllers
-{
-    /// <summary>
-    /// 团组相关
-    /// </summary>
-    //[Authorize]
-    [Route("api/[controller]/[action]")]
-    [ApiController]
-    public class GroupController : ControllerBase
-    {
-        private readonly IMapper _mapper;
-        private readonly DelegationInfoRepository _groupRepository;
-
-        public GroupController(IMapper mapper, DelegationInfoRepository groupRepository)
-        { 
-            this._mapper = mapper;
-            this._groupRepository = groupRepository;
-        }
-
-        /// <summary>
-        ///  接团信息
-        /// </summary>
-        /// <param name="dto">团组列表请求dto</param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IActionResult> GetGroupList(GroupListDto dto)
-        { 
-            var groupData= await _groupRepository.GetGroupList(dto);
-            if (groupData.Code != 0)
-            {
-                return Ok(JsonView(false, groupData.Msg));
-            }
-
-            return Ok(JsonView(groupData.Data, groupData.Data.Count));
-        }
-
-        /// <summary>
-        ///  接团信息
-        /// </summary>
-        /// <param name="dto">团组info请求dto</param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IActionResult> GetGroupInfo(GroupInfoDto dto)
-        {
-            var groupData = await _groupRepository.GetGroupInfo(dto);
-            if (groupData.Code != 0)
-            {
-                return Ok(JsonView(false, groupData.Msg));
-            }
-
-            return Ok(JsonView(groupData.Data, groupData.Data.Count));
-        }
-
-        /// <summary>
-        /// 接团信息 编辑添加
-        /// 基础信息数据源
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IActionResult> GetGroupEditBasicSource(GroupListDto dto)
-        {
-            var groupData = await _groupRepository.GetGroupEditBasicSource(dto);
-            if (groupData.Code != 0)
-            {
-                return Ok(JsonView(false, groupData.Msg));
-            }
-
-            return Ok(JsonView(groupData.Data));
-        }
-
-        /// <summary>
-        /// 接团信息 操作
-        /// 基础信息数据源
-        /// </summary>
-        /// <param name="dto"></param>
-        /// <returns></returns>
-        [HttpPost]
-        public async Task<IActionResult> GroupOperation(GroupOperationDto dto)
-        {
-            var groupData = await _groupRepository.GroupOperation(dto);
-            if (groupData.Code != 0)
-            {
-                return Ok(JsonView(false, groupData.Msg));
-            }
-
-            return Ok(JsonView(true));
-        }
-    }
-}

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -15,10 +15,12 @@ namespace OASystem.API.Controllers
     {
         private readonly GrpScheduleRepository _grpScheduleRep;
         private readonly IMapper _mapper;
-        public GroupsController(IMapper mapper, GrpScheduleRepository grpScheduleRep)
+        private readonly DelegationInfoRepository _groupRepository;
+        public GroupsController(IMapper mapper, GrpScheduleRepository grpScheduleRep, DelegationInfoRepository groupRepository)
         {
             _mapper = mapper;
             _grpScheduleRep = grpScheduleRep;
+            _groupRepository = groupRepository;
         }
 
         #region 流程管控
@@ -63,5 +65,79 @@ namespace OASystem.API.Controllers
 
         #endregion
 
+
+        #region 团组基本信息
+
+        /// <summary>
+        ///  接团信息 List
+        /// </summary>
+        /// <param name="dto">团组列表请求dto</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> GetGroupList(GroupListDto dto)
+        {
+            var groupData = await _groupRepository.GetGroupList(dto);
+            if (groupData.Code != 0)
+            {
+                return Ok(JsonView(false, groupData.Msg));
+            }
+
+            return Ok(JsonView(groupData.Data, groupData.Data.Count));
+        }
+
+        /// <summary>
+        ///  接团信息 Singe
+        /// </summary>
+        /// <param name="dto">团组info请求dto</param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> GetGroupInfo(GroupInfoDto dto)
+        {
+            var groupData = await _groupRepository.GetGroupInfo(dto);
+            if (groupData.Code != 0)
+            {
+                return Ok(JsonView(false, groupData.Msg));
+            }
+
+            return Ok(JsonView(groupData.Data, groupData.Data.Count));
+        }
+
+        /// <summary>
+        /// 接团信息 编辑添加
+        /// 基础信息数据源
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> GetGroupEditBasicSource(GroupListDto dto)
+        {
+            var groupData = await _groupRepository.GetGroupEditBasicSource(dto);
+            if (groupData.Code != 0)
+            {
+                return Ok(JsonView(false, groupData.Msg));
+            }
+
+            return Ok(JsonView(groupData.Data));
+        }
+
+        /// <summary>
+        /// 接团信息 操作
+        /// 基础信息数据源
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        public async Task<IActionResult> GroupOperation(GroupOperationDto dto)
+        {
+            var groupData = await _groupRepository.GroupOperation(dto);
+            if (groupData.Code != 0)
+            {
+                return Ok(JsonView(false, groupData.Msg));
+            }
+
+            return Ok(JsonView(true));
+        }
+
+        #endregion
     }
 }

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -1,4 +1,4 @@
-using OASystem.Domain.Dtos.Group;
+using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Dtos.System;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.Domain.Entities;

OASystem/OASystem.Domain/Dtos/Group/GroupListDto.cs

@@ -4,7 +4,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OASystem.Domain.Dtos.Group
+namespace OASystem.Domain.Dtos.Groups
 {
     /// <summary>
     /// 获取团组列表 请求实体类

OASystem/OASystem.Infrastructure/Repositories/Group/DelegationInfoRepository.cs

@@ -1,6 +1,6 @@
 using OASystem.Domain;
 using OASystem.Domain.Dtos;
-using OASystem.Domain.Dtos.Group;
+using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Dtos.UserDto;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Group;
@@ -13,7 +13,7 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 
-namespace OASystem.Infrastructure.Repositories.Group
+namespace OASystem.Infrastructure.Repositories.Groups
 {
     /// <summary>
     /// 接团信息