PostHotelReservationsBasicsDataInit 增加返回对象countrys(三公国家费用标准) PostHotelReservationsDetails 增加返回字段AreaId(对应三公费用国家Id) PostHotelReservationsAddOrEdit 增加请求字段AreaId(对应三公费用国家Id)

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -11575,7 +11575,7 @@ ORDER by  gctggrc.id DESC
             #endregion
 
             #endregion
-
+            
             return Ok(await _hotelPriceRep._ItemsByDiId(_dto.PortType, _dto.DiId));
         }
 
@@ -11772,7 +11772,6 @@ ORDER by  gctggrc.id DESC
                 await _tableorRep.AddAsync(opInfo);
                 #endregion
 
-
                 _logger.LogInformation($"【iOS推送通知Exception】Begin");
                 //2024-10-21 新增LZ UID
                 var userIds = new List<int>() { 21 };
@@ -11890,12 +11889,24 @@ ORDER by  gctggrc.id DESC
 
             if (pageFunAuthView.DeleteAuth == 0) return Ok(JsonView(false, "您没有删除权限!"));
 
+            #endregion
 
             #endregion
 
+            var data = await _hotelPriceRep._Del(_dto.Id, _dto.UserId);
+
+            #region 操作记录
+            await _tableorRep.AddAsync(new Crm_TableOperationRecord()
+            {
+                TableName = "Grp_HotelReservations",
+                PortType = _dto.PortType,
+                OperationItem = OperationEnum.Del,
+                DataId = _dto.Id,
+                CreateUserId = _dto.UserId
+            });
             #endregion
 
-            return Ok(await _hotelPriceRep._Del(_dto.Id, _dto.UserId));
+            return Ok(data);
         }
 
         /// <summary>

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -45,6 +45,8 @@ namespace OASystem.API.Controllers
         private readonly TourClientListRepository _tourClientListRep;
         private readonly DelegationInfoRepository _delegationInfoRep;
         private readonly TranslatorLibraryRepository _translatorRep;
+        private readonly MediaSuppliersRepository _mediaSupplierRep;
+        private readonly List<int> _portIds;
 
         public ResourceController(
             IMapper mapper, 
@@ -65,7 +67,8 @@ namespace OASystem.API.Controllers
             TicketBlackCodeRepository ticketBlackCodeRep, 
             TourClientListRepository tourClientListRep, 
             DelegationInfoRepository delegationInfoRep,
-            TranslatorLibraryRepository translatorRep
+            TranslatorLibraryRepository translatorRep,
+            MediaSuppliersRepository mediaSupplierRep
             )
         {
             _mapper = mapper;
@@ -87,9 +90,10 @@ namespace OASystem.API.Controllers
             _tourClientListRep = tourClientListRep;
             _delegationInfoRep = delegationInfoRep;
             _translatorRep = translatorRep;
+            _mediaSupplierRep = mediaSupplierRep;
+            _portIds = new List<int> { 1, 2, 3 };
         }
 
-
         #region 车公司资料板块
 
         /// <summary>
@@ -4144,6 +4148,94 @@ WHERE
         }
 
         #endregion
+
+        #region 策划部供应商资料
+
+        /// <summary>
+        /// 策划部供应商资料
+        /// Init
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpGet]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> MediaSupplierInit()
+        {
+            return Ok(JsonView(await _mediaSupplierRep.Init()));
+        }
+
+        /// <summary>
+        /// 策划部供应商资料
+        /// Info
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> MediaSupplierInfo(MediaSupplierInfoDto dto)
+        {
+            if (!_portIds.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+
+            if (dto.Id < 1) return Ok(JsonView(false, MsgTips.Port));
+
+            return Ok(JsonView(await _mediaSupplierRep.Info(dto)));
+        }
+
+        /// <summary>
+        /// 策划部供应商资料
+        /// 分页查询
+        /// </summary>
+        /// <param name="id"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> MediaSupplierPageItem(MediaSupplierPageItemDto dto)
+        {
+            if (!_portIds.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+
+            return Ok(JsonView(await _mediaSupplierRep.PageItem(dto)));
+        }
+
+        /// <summary>
+        /// 策划部供应商资料
+        /// 操作(添加 Or 编辑)
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> MediaSupplierOp(MediaSupplierAddOrEditDto dto)
+        {
+            var result = new JsonView() { Code = 400, Msg = "操作失败" };
+            var userId = dto.CurrUserId;
+            if (!_portIds.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+
+            if (userId < 1) return Ok(JsonView(false, MsgTips.UserId));
+
+            return Ok(JsonView(await _mediaSupplierRep.AddOrEdit(dto)));
+        }
+
+        /// <summary>
+        /// 策划部供应商资料
+        /// 删除
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> MediaSupplierSoftDel(MediaSupplierSoftDelDto dto)
+        {
+            var result = new JsonView() { Code = 400, Msg = "操作失败" };
+            int userId = dto.CurrUserId, id = dto.Id;
+            if (!_portIds.Contains(dto.PortType)) return Ok(JsonView(false, MsgTips.Port));
+
+            if (userId < 1) return Ok(JsonView(false, MsgTips.UserId));
+            if (id < 1) return Ok(JsonView(false, MsgTips.Id));
+
+            return Ok(JsonView(await _mediaSupplierRep.SoftDel(dto)));
+        }
+
+        #endregion
     }
 }
 

OASystem/OASystem.Domain/Dtos/Groups/HotelReservationsDto.cs

@@ -80,6 +80,11 @@ namespace OASystem.Domain.Dtos.Groups
         /// </summary>
         public string? DetermineNo { get; set; }
 
+        /// <summary>
+        /// 区域Id
+        /// </summary>
+        public int AreaId { get; set; }
+
         /// <summary>
         /// 城市
         /// </summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_HotelReservations.cs

@@ -42,6 +42,13 @@ namespace OASystem.Domain.Entities.Groups
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(225)")]
         public string DetermineNo { get; set; }
+
+        /// <summary>
+        /// 区域Id(Grp_NationalTravelFee Id)
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int AreaId { get; set; }
+
         /// <summary>
         /// 所在城市
         /// </summary>

OASystem/OASystem.Domain/ViewModels/Groups/HotelReservationsByDiIdView.cs

@@ -135,6 +135,11 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public string? DetermineNo { get; set; }
 
+        /// <summary>
+        /// 区域Id
+        /// </summary>
+        public int AreaId { get; set; }
+
         /// <summary>
         /// 城市
         /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/HotelPriceRepository.cs

@@ -125,6 +125,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 //客户名单
                 var guestNames = await _tourClientListRep._GuestNameItemByDiId(portType, diId);
 
+                //三公国家费用标准
+                var countrys = await _sqlSugar.Queryable<Grp_NationalTravelFee>()
+                    .Where(x => x.IsDel == 0 )
+                    .Select(x => new {
+                        x.Id,
+                        x.Country,
+                        x.City
+                    })
+                    .ToListAsync();
+
                 var data = new
                 {
                     GuestType = _GuestType, //客人分类
@@ -134,7 +144,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     BookingWebsite = _BookingWebsite,
                     CheckPerson = _CheckPerson,
                     CheckVolumeNo = _CheckVolumeNo,
-                    GuestName = guestNames
+                    GuestName = guestNames,
+                    Countrys = countrys
                 };
 
                 _view.Code = 200;
@@ -198,7 +209,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             }
 
             string sql = string.Format(@"Select hr.Id,hr.DiId,hr.GTId,hr.CheckNumber,hr.ReservationsWebsite,hr.ReservationsNo,
-                                         hr.DetermineNo,hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,
+                                         hr.DetermineNo,hr.AreaId,hr.City,hr.HotelName,hr.HotelTel,hr.HotelAddress,hr.GuestName,hr.CheckInDate,hr.CheckOutDate,
                                          hr.CheckType,hr.RoomExplanation,hr.Remark As HotelRemark,hr.SingleRoomPrice,hr.SingleRoomCount,hr.DoubleRoomPrice,
                                          hr.DoubleRoomCount,hr.SuiteRoomPrice,hr.SuiteRoomCount,hr.OtherRoomPrice,hr.OtherRoomCount,hr.CardPrice,hr.CardPriceCurrency,
                                          hr.Isoppay,hr.BreakfastPrice,hr.BreakfastCurrency,hr.GovernmentRent,hr.GovernmentRentCurrency,hr.CityTax,
@@ -432,6 +443,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                                          it.ReservationsWebsite,
                                                          it.ReservationsNo,
                                                          it.DetermineNo,
+                                                         it.AreaId,
                                                          it.City,
                                                          it.HotelName,
                                                          it.HotelTel,

OASystem/OASystem.Infrastructure/Repositories/Resource/MediaSuppliersRepository.cs

@@ -15,14 +15,14 @@ namespace OASystem.Infrastructure.Repositories.Resource
     /// 策划部供应商资料
     /// 仓储
     /// </summary>
-    public class MediaSuppliersRepository:BaseRepository<Res_MediaSuppliers, Res_MediaSuppliers>
+    public class MediaSuppliersRepository : BaseRepository<Res_MediaSuppliers, Res_MediaSuppliers>
     {
         private readonly IMapper _mapper;
         private readonly List<int> _portIds;
         public MediaSuppliersRepository(SqlSugarClient sqlSugar, IMapper mapper) : base(sqlSugar)
         {
             _mapper = mapper;
-            _portIds =  new List<int> { 1, 2, 3 };
+            _portIds = new List<int> { 1, 2, 3 };
         }
 
         /// <summary>
@@ -50,11 +50,12 @@ namespace OASystem.Infrastructure.Repositories.Resource
 
             if (!_portIds.Contains(dto.PortType)) { result.Msg = MsgTips.Port; return result; }
 
-            if (dto.Id < 1) { result.Msg = MsgTips.Id;return result; }
+            if (dto.Id < 1) { result.Msg = MsgTips.Id; return result; }
 
             var info = await _sqlSugar.Queryable<Res_MediaSuppliers>()
                 .Where(x => x.IsDel == 0 && x.Id == dto.Id)
-                .Select(x => new { 
+                .Select(x => new
+                {
                     x.Id,
                     x.TypeId,
                     x.Privince,
@@ -92,9 +93,10 @@ namespace OASystem.Infrastructure.Repositories.Resource
             var search = dto.Search;
             RefAsync<int> total = 0;
             var infos = await _sqlSugar.Queryable<Res_MediaSuppliers>()
-                .LeftJoin<Sys_Users>((ms,u) => ms.CreateUserId == u.Id)
+                .LeftJoin<Sys_Users>((ms, u) => ms.CreateUserId == u.Id)
                 .Where((ms, u) => ms.IsDel == 0)
                 .WhereIF(!string.IsNullOrEmpty(search), (ms, u) => ms.UnitName.Contains(search) || ms.Contact.Contains(search) || ms.Tel.Contains(search))
+                .OrderByDescending((ms, u) => ms.CreateTime)
                 .Select((ms, u) => new
                 {
                     ms.Id,
@@ -142,7 +144,7 @@ namespace OASystem.Infrastructure.Repositories.Resource
             }
             else if (info.Id > 0) //编辑
             {
-                var upd = await _sqlSugar.Updateable(info).IgnoreColumns(x => new { x.CreateUserId,x.CreateTime }).ExecuteCommandAsync();
+                var upd = await _sqlSugar.Updateable(info).IgnoreColumns(x => new { x.CreateUserId, x.CreateTime }).ExecuteCommandAsync();
                 if (upd > 0)
                 {
                     result.Code = 200;