新增App端团组下拉框及简单数据方法

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -394,7 +394,29 @@ namespace OASystem.API.Controllers
 
             return Ok(JsonView(groupData.Data));
         }
-
+        /// <summary>
+        /// 根据CTable类型返回对应的团组名称及简单数据（APP端）
+        /// </summary>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> PostGroupNameAndEasy(DecreasePaymentsDto dto)
+        {
+            try
+            {
+                Result groupData = await _decreasePaymentsRep.PostGroupNameAndEasy(dto);
+                if (groupData.Code != 0)
+                {
+                    return Ok(JsonView(false, groupData.Msg));
+                }
+                return Ok(JsonView(true, groupData.Msg, groupData.Data));
+            }
+            catch (Exception ex)
+            {
+                return Ok(JsonView(false, "程序错误！"));
+                throw;
+            }
+        }
         #endregion
 
         #region 团组&签证

OASystem/OASystem.Domain/Dtos/Groups/DecreasePaymentsDto.cs

@@ -13,6 +13,8 @@ namespace OASystem.Domain.Dtos.Groups
     {
         public int UserId { get; set; }
         public int CTId { get; set; }
+        public int PageIndex { get; set; } = 1;
+        public int PageSize { get; set; } = 10;
     }
     public class DecreasePaymentsListDto
     {

OASystem/OASystem.Domain/ViewModels/Groups/DelegationEasyView.cs

@@ -0,0 +1,50 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.Groups
+{
+    public class DelegationEasyView
+    {
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 团组号
+        /// </summary>
+        public string TourCode { get; set; }
+        /// <summary>
+        /// 团组名称
+        /// </summary>
+        public string TeamName { get; set; }
+        /// <summary>
+        /// 客户名称
+        /// </summary>
+        public string ClientName { get; set; }
+        /// <summary>
+        /// 出团时间起
+        /// </summary>
+        public DateTime VisitStartDate { get; set; }
+        /// <summary>
+        /// 出团时间止
+        /// </summary>
+        public DateTime VisitEndDate { get; set; }
+        /// <summary>
+        /// 出访国家
+        /// </summary>
+        public string VisitCountry { get; set; }
+        
+        /// <summary>
+        /// 出访天数
+        /// </summary>
+        public int VisitDays { get; set; }
+        /// <summary>
+        /// 出访人数
+        /// </summary>
+        public int VisitPNumber { get; set; }
+        
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Groups/DecreasePaymentsRepository.cs

@@ -5,6 +5,8 @@ using OASystem.Domain.Entities.Financial;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels.Groups;
+using OASystem.Domain.ViewModels.QiYeWeChat;
+using OASystem.Domain.ViewModels.Resource;
 using OASystem.Infrastructure.Repositories.System;
 using System;
 using System.Collections.Generic;
@@ -303,6 +305,67 @@ namespace OASystem.Infrastructure.Repositories.Groups
             return result;
         }
 
+        public async Task<Result> PostGroupNameAndEasy(DecreasePaymentsDto dto)
+        {
+            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            try
+            {
+                #region 团组下拉框
+
+
+                List<Grp_GroupsTaskAssignment> grp_GroupsTaskAssignment = Query<Grp_GroupsTaskAssignment>(a => a.IsDel == 0 && a.UId == dto.UserId && a.CTId == dto.CTId).ToList();
+
+                string DiId = "";
+                foreach (var item in grp_GroupsTaskAssignment)
+                {
+                    DiId += item.DIId + ",";
+                }
+                DiId = DiId.Substring(0, DiId.Length - 1);
+                string sql = string.Format(@"select Id,TourCode,TeamName,ClientName,VisitStartDate,VisitEndDate,VisitCountry,VisitDays,VisitPNumber from Grp_DelegationInfo where Id in({0}) and IsDel={1}", DiId, 0);
+                List<DelegationEasyView> grp_Delegations = _sqlSugar.SqlQueryable<DelegationEasyView>(sql).ToList();
+                if (grp_Delegations.Count != 0)
+                {
+                    int count = grp_Delegations.Count;
+                    float totalPage = (float)count / dto.PageSize;//总页数
+                    if (totalPage == 0) totalPage = 1;
+                    else totalPage = (int)Math.Ceiling((double)totalPage);
+
+                    List<DelegationEasyView> delegationEasyViews = new List<DelegationEasyView>();
+                    for (int i = 0; i < dto.PageSize; i++)
+                    {
+                        var RowIndex = i + (dto.PageIndex - 1) * dto.PageSize;
+                        if (RowIndex < grp_Delegations.Count)
+                        {
+                            delegationEasyViews.Add(grp_Delegations[RowIndex]);
+                        }
+                        else
+                        {
+                            break;
+                        }
+                    }
+                    ListViewBase<DelegationEasyView> rst = new ListViewBase<DelegationEasyView>();
+                    rst.DataList = delegationEasyViews;
+                    rst.DataCount = count;
+                    rst.CurrPageIndex = dto.PageIndex;
+                    rst.CurrPageSize = dto.PageSize;
+                    return result = new Result() { Code = 0, Msg = "查询成功！", Data = rst };
+                }
+                else
+                {
+                    ListViewBase<DelegationEasyView> rst = new ListViewBase<DelegationEasyView>();
+                    return result = new Result() { Code = 0, Msg = "暂无数据！", Data = rst };
+                }
+                #endregion
+
+               
+            }
+            catch (Exception ex)
+            {
+                return result = new Result() { Code = -2, Msg = "程序错误" };
+                throw;
+            }
+        }
+
         /// <summary>
         /// 根据团组增减款项表Id查询数据
         /// </summary>