Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -452,7 +452,7 @@ namespace OASystem.API.Controllers
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
 
-        public async Task<IActionResult> PostIOSVisaProress(IOS_VisaDto dto)
+        public async Task<IActionResult> PostIOSVisaProgress(IOS_VisaDto dto)
         {
             if (dto == null)
             {
@@ -463,7 +463,7 @@ namespace OASystem.API.Controllers
             {
                 DelegationVisaViewList visaList = _delegationVisaRep.GetDelegationList(dto);
 
-                return Ok(visaList);
+                return Ok(JsonView(visaList));
             }
             //else
             //{

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -98,6 +98,7 @@ namespace OASystem.Domain.AutoMappers
             #region 商邀费用
             CreateMap<OpInvitationOfficialActivitiesDto, Grp_InvitationOfficialActivities>();
             CreateMap<OpInvitationOfficialActivitiesDto,Res_InvitationOfficialActivityData>();
+            CreateMap<Grp_InvitationOfficialActivities, InvitationOfficialActivitiesByIdView>();
             #endregion
 
             #region 团组英文资料

OASystem/OASystem.Domain/Dtos/Groups/InvitationOfficialActivitiesListDto.cs

@@ -22,7 +22,7 @@ namespace OASystem.Domain.Dtos.Groups
     /// <summary>
     /// 根据id查询C表数据和商邀费用数据
     /// </summary>
-    public class InvitationOfficialActivitiesByIdDto
+    public class InvitationOfficialActivitiesByIdDto: PortDtoBase
     {
         public int Id { get; set; }
     }

OASystem/OASystem.Domain/ViewModels/Groups/InvitationOfficialActivitiesByIdView.cs

@@ -0,0 +1,109 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OASystem.Domain.ViewModels.Groups
+{
+    public class InvitationOfficialActivitiesByIdView
+    {
+        /// <summary>
+        /// 支付方式
+        /// </summary>
+        public int PayDId { get; set; }
+        /// <summary>
+        /// 费用表示
+        /// </summary>
+        public int OrbitalPrivateTransfer { get; set; }
+        /// <summary>
+        /// 收款方
+        /// </summary>
+        public string Payee { get; set; }
+        //---------------------商邀参数--------------------------
+        /// <summary>
+        /// 主键Id
+        /// </summary>
+        public int Id { get; set; }
+        /// <summary>
+        /// 团组外键编号
+        /// </summary>
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 邀请方地区
+        /// </summary>
+        public string InviterArea { get; set; }
+
+        /// <summary>
+        /// 邀请方
+        /// </summary>
+        public string Inviter { get; set; }
+
+        /// <summary>
+        /// 邀请时间
+        /// </summary>
+        public DateTime InviteTime { get; set; }
+
+        /// <summary>
+        /// 附件
+        /// </summary>
+        public string Attachment { get; set; }
+
+        /// <summary>
+        /// 邀请费用
+        /// </summary>
+        public decimal InviteCosts { get; set; }
+
+        /// <summary>
+        /// 币种
+        /// </summary>
+        public int Currency { get; set; }
+
+        /// <summary>
+        /// 快递费用
+        /// </summary>
+        public decimal SendCost { get; set; }
+
+        /// <summary>
+        /// 公务标识（是否到场）
+        /// </summary>
+        public int IsGoOfficaiaBussiness { get; set; }
+        /// <summary>
+        /// 创建者Id
+        /// </summary>
+        public int CreateUserId { get; set; }
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string Remark { get; set; }
+        //-----------------------邀请方资料----------
+
+        /// 邀请方地址
+        public string Address { get; set; }
+        /// <summary>
+        /// 联系人
+        /// </summary>
+        public string Contact { get; set; }
+        /// <summary>
+        /// 职务
+        /// </summary>
+        public string Job { get; set; }
+        /// <summary>
+        /// 联系电话
+        /// </summary>
+        public string Tel { get; set; }
+        /// <summary>
+        /// 电子邮箱
+        /// </summary>
+        public string Email { get; set; }
+        /// <summary>
+        /// 传真号码
+        /// </summary>
+        public string Fax { get; set; }
+        /// <summary>
+        /// 其他信息
+        /// </summary>
+        public string OtherInformation { get; set; }
+    }
+}

OASystem/OASystem.Infrastructure/Repositories/Groups/InvitationOfficialActivitiesRepository.cs

@@ -7,6 +7,7 @@ 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 System;
 using System.Collections.Generic;
 using System.Linq;
@@ -40,14 +41,54 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 if (grp_Invitation!=null)
                 {
                     res_InvitationOfficialActivityData = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>().First(a =>a.Country==grp_Invitation.InviterArea && a.UnitName==grp_Invitation.Inviter && a.IsDel == 0);
+                    if (dto.PortType == 1)
+                    {
+                        var data = new
+                        {
+                            _Invitation = grp_Invitation,
+                            _InvitationData = res_InvitationOfficialActivityData,
+                            _CreditCard = grp_CreditCard,
+                        };
+                        result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+                    }
+                    else
+                    {
+                        InvitationOfficialActivitiesByIdView invitation = _mapper.Map<InvitationOfficialActivitiesByIdView>(grp_Invitation);
+
+                        invitation.PayDId = grp_CreditCard.PayDId;
+                        invitation.OrbitalPrivateTransfer = grp_CreditCard.OrbitalPrivateTransfer;
+                        invitation.Payee = grp_CreditCard.Payee;
+                        invitation.Address = res_InvitationOfficialActivityData.Address;
+                        invitation.Contact = res_InvitationOfficialActivityData.Contact;
+                        invitation.Job = res_InvitationOfficialActivityData.Job;
+                        invitation.Tel = res_InvitationOfficialActivityData.Tel;
+                        invitation.Email = res_InvitationOfficialActivityData.Email;
+                        invitation.Fax = res_InvitationOfficialActivityData.Fax;
+                        invitation.OtherInformation = res_InvitationOfficialActivityData.Remark;
+                        result = new Result() { Code = 0, Msg = "查询成功！", Data = invitation };
+                    }
                 }
-                var data = new
+                else
                 {
-                    _Invitation = grp_Invitation,
-                    _InvitationData = res_InvitationOfficialActivityData,
-                    _CreditCard = grp_CreditCard,
-                };
-                result = new Result() { Code = 0, Msg = "查询成功！", Data = data };
+                    if (dto.PortType == 1)
+                    {
+                        var data = new
+                        {
+                            _Invitation = grp_Invitation,
+                            _InvitationData = res_InvitationOfficialActivityData,
+                            _CreditCard = grp_CreditCard,
+                        };
+                        result = new Result() { Code = 0, Msg = "暂无数据！", Data = data };
+                    }
+                    else
+                    {
+                        InvitationOfficialActivitiesByIdView invitation = _mapper.Map<InvitationOfficialActivitiesByIdView>(grp_Invitation);
+                        result = new Result() { Code = 0, Msg = "暂无数据！", Data = invitation };
+                    }
+                }
+                
+                
+                
             }
             catch (Exception)
             {