优化签证费用相关功能及数据模型

在 `ResourceController.cs` 中重构了查询和操作方法，简化逻辑并合并重复代码。新增 `QueryVisaCountryFeeCosts` 方法以支持签证费用查询，并进行了参数校验。

在 `CountryFeeCostDto.cs` 中新增多个字段以支持更多签证费用信息，并新增查询 DTO。

在 `CountryFeeCostView.cs` 中添加 `DaysSinceUpdate` 属性以计算更新天数。

重命名并简化 `CountryFeeRepository.cs` 中的方法，调整返回类型以更好地处理结果。

修正 `Crm_DeleClient.cs` 中的类命名以符合规范，并在 `Res_CountryFeeCost.cs` 中保持数据模型一致性。

修正 `VisaFeeInfoRepository.cs` 中的方法调用，确保正确性。

在 `_baseMappingProfile.cs` 中新增签证费用相关的映射配置。

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -1,7 +1,6 @@
 using Aspose.Cells;
 using Aspose.Words;
 using EyeSoft.Extensions;
-using NPOI.SS.Formula.PTG;
 using OASystem.API.OAMethodLib;
 using OASystem.API.OAMethodLib.QiYeWeChatAPI.AppNotice;
 using OASystem.Domain.AesEncryption;
@@ -9,11 +8,9 @@ using OASystem.Domain.Dtos.Groups;
 using OASystem.Domain.Entities.Groups;
 using OASystem.Domain.ViewModels.Groups;
 using OASystem.Infrastructure.Repositories.Groups;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
 using System.Data;
 using System.Diagnostics;
-using System.Linq;
 using static OASystem.API.OAMethodLib.JWTHelper;
 
 namespace OASystem.API.Controllers
@@ -806,31 +803,47 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> QueryCountryFeeCost(DtoBase dto)
         {
+            var portType = dto.PortType;
+            var countryVisaFees = await _countryFeeRep
+                .QueryDto<Res_CountryFeeCost, CountryFeeCostView>()
+                .OrderByDescending(x => x.CreateTime)
+                .ToListAsync();
 
-            if (dto.PortType == 1)
-            {
-                var CountryFee = _countryFeeRep.QueryDto<Res_CountryFeeCost, CountryFeeCostView>().ToList();
-                if (CountryFee.Count == 0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
-                CountryFee = CountryFee.OrderByDescending(s => s.CreateTime).ToList();
-                return Ok(JsonView(true, "查询成功", CountryFee));
-            }
-            else if (dto.PortType == 2)
-            {
-                var CountryFee = _countryFeeRep.QueryDto<Res_CountryFeeCost, CountryFeeCostView>().ToList();
-                if (CountryFee.Count == 0)
-                {
-                    return Ok(JsonView(false, "暂无数据！"));
-                }
-                CountryFee = CountryFee.OrderByDescending(s => s.CreateTime).ToList();
-                return Ok(JsonView(true, "查询成功", CountryFee));
-            }
-            else
-            {
+            if (!countryVisaFees.Any()) return Ok(JsonView(false, "暂无数据！"));
+
+            if (portType == 1) return Ok(JsonView(true, "查询成功", countryVisaFees));
+            else if (portType == 2 || portType == 3) return Ok(JsonView(true, "查询成功", countryVisaFees));
+            else return Ok(JsonView(false, "请传入PortType参数！1:Web，2:Android,3:IOS"));
+        }
+
+        /// <summary>
+        /// 签证费用资料查询 Page New
+        /// </summary>
+        /// <param name="dto"></param>
+        /// <returns></returns>
+        [HttpPost]
+        [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
+        public async Task<IActionResult> QueryVisaCountryFeeCosts(QueryVisaCountryFeeCostsDto dto)
+        {
+            // 校验端口类型
+            if (dto.PortType != 1 && dto.PortType != 2 && dto.PortType != 3)
                 return Ok(JsonView(false, "请传入PortType参数！1:Web，2:Android,3:IOS"));
-            }
+
+            var portType = dto.PortType;
+            RefAsync<int> total = 0;
+            var query = _countryFeeRep._sqlSugar
+                .Queryable<Res_CountryFeeCost>()
+                .Where(x => x.IsDel == 0)
+                .WhereIF(dto.VisaFeeType >= 0, x => x.VisaFeeType == dto.VisaFeeType)
+                .WhereIF(!string.IsNullOrEmpty(dto.CountryName), x => x.VisaCountry.Contains(dto.CountryName))
+                .OrderByDescending(x => x.CreateTime);
+
+            var countryVisaFees = await query.ToPageListAsync(dto.PageIndex, dto.PageSize, total);
+
+            if (!countryVisaFees.Any()) return Ok(JsonView(false, "暂无数据！"));
+            var view = _mapper.Map<List<CountryFeeCostView>>(countryVisaFees);
+
+            return Ok(JsonView(true, "查询成功", view, total));
         }
 
         /// <summary>
@@ -842,29 +855,10 @@ namespace OASystem.API.Controllers
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> OperationCountryFeeCost(OperationCountryFeeCostDto dto)
         {
-            if (string.IsNullOrWhiteSpace(dto.VisaContinent))
-            {
-                return Ok(JsonView(false, "请检查州名是否填写！"));
-            }
-            if (string.IsNullOrWhiteSpace(dto.VisaCountry))
-            {
-                return Ok(JsonView(false, "请检查国家名是否填写！"));
-            }
-            if (string.IsNullOrWhiteSpace(dto.VisaTime))
-            {
-                return Ok(JsonView(false, "请检一般签证时间是否填写正确！"));
-            }
-            if (string.IsNullOrWhiteSpace(dto.UrgentTime))
-            {
-                return Ok(JsonView(false, "请检加急时间是否填写正确！"));
-            }
+            if (string.IsNullOrWhiteSpace(dto.VisaContinent) || string.IsNullOrWhiteSpace(dto.VisaCountry))
+                return Ok(JsonView(false, "请检查州名和国家名是否填写！"));
 
-            Result result = await _countryFeeRep.OperationCountryFeeCost(dto);
-            if (result.Code == 0)
-            {
-                return Ok(JsonView(true, result.Msg));
-            }
-            return Ok(JsonView(false, result.Msg));
+            return Ok(await _countryFeeRep.OperationCountryFeeCost(dto));
 
         }
 
@@ -877,10 +871,8 @@ namespace OASystem.API.Controllers
         public async Task<IActionResult> DelCountryFeeCost(DelCountryFeeCostDto dto)
         {
             var res = await _countryFeeRep.SoftDeleteByIdAsync<Res_CountryFeeCost>(dto.Id.ToString(), dto.DeleteUserId);
-            if (!res)
-            {
-                return Ok(JsonView(false, "删除失败"));
-            }
+            if (!res) return Ok(JsonView(false, "删除失败"));
+
             return Ok(JsonView(true, "删除成功！"));
 
         }
@@ -1629,14 +1621,14 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
 
                 var InvitationOfficialActivityDataList = _sqlSugar.Queryable<Res_InvitationOfficialActivityData>()
                     .Where(x => x.IsDel == 0)
-                    .Select(x => new Res_InvitationOfficialActivityData() {Id=x.Id,Country = x.Country })
+                    .Select(x => new Res_InvitationOfficialActivityData() { Id = x.Id, Country = x.Country })
                     .ToList();
 
                 foreach (var item in InvitationOfficialActivityDataList)
                 {
                     EncryptionProcessor.DecryptProperties(item);
                 }
-                
+
                 var ids = InvitationOfficialActivityDataList
                     .WhereIF(europeanCountries.Any(), x => !string.IsNullOrWhiteSpace(x.Country) && europeanCountries.Contains(x.Country))
                     .Select(x => x.Id)
@@ -2180,14 +2172,16 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
             var translatorData1 = _mapper.Map<List<TranslatorView>>(translatorData);
             foreach (var item in translatorData1) EncryptionProcessor.DecryptProperties(item);
 
-            return Ok(JsonView(true, 
-                "查询成功！", 
-                new { Delegation = groupInfos, 
-                    SetData = data1, 
-                    DataSource = data2, 
-                    currencyData = data3, 
-                    DeleFile = _DeleFile, 
-                    TranslatorData = translatorData1 
+            return Ok(JsonView(true,
+                "查询成功！",
+                new
+                {
+                    Delegation = groupInfos,
+                    SetData = data1,
+                    DataSource = data2,
+                    currencyData = data3,
+                    DeleFile = _DeleFile,
+                    TranslatorData = translatorData1
                 }));
         }
 
@@ -2818,7 +2812,7 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
 
 
                     builder.MoveToCell(0, i + 1, 3, 0);
-                    
+
                     //string birthDay = "";
                     string birthDayStr = string.Empty;
                     if (guestInfo.BirthDay != DateTime.MinValue)
@@ -4666,7 +4660,7 @@ WHERE
             return Ok(await _mediaSupplierRep.SoftDel(dto));
         }
 
-        
+
 
 
 
@@ -4818,9 +4812,9 @@ WHERE
         /// <returns></returns>
         [HttpGet("{id}")]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
-        public async Task<IActionResult> GamesBudgetMasterInfo([Required(ErrorMessage = "数据编号不能为空!")]int id)
+        public async Task<IActionResult> GamesBudgetMasterInfo([Required(ErrorMessage = "数据编号不能为空!")] int id)
         {
-            return Ok( await _gamesBudgetMasterRep.InfoAsync(id));
+            return Ok(await _gamesBudgetMasterRep.InfoAsync(id));
         }
 
         /// <summary>

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -239,27 +239,33 @@ namespace OASystem.Domain.AutoMappers
             CreateMap<UpCarDataDto, Res_CarData>();
             CreateMap<Res_CarData, CarDataSelectView>();
             #endregion
+
             #region 导游地接资料
             CreateMap<Res_LocalGuideData, LocalGuideDataView>();
             CreateMap<LocalGuideOperationDto, Res_LocalGuideData>();
             CreateMap<Res_LocalGuideData, Res_LocalGuideData_ListItemView>();
             #endregion
+
             #region 机场三字码资料
             CreateMap<Res_ThreeCode, ThreeCodeView>();
             CreateMap<ThreeCodeOperationDto, Res_ThreeCode>();
             #endregion
+
             #region 代理商合作资料
             CreateMap<OpAirTicketAgentDto, Res_AirTicketAgent>();
             #endregion
+
             #region 酒店资料数据
             CreateMap<Res_HotelData, HotelDataView>();
             CreateMap<Res_HotelData, QueryHotelDataSelect>();
             CreateMap<OperationHotelDto, Res_HotelData>();
             #endregion
+
             #region 签证费用资料
             CreateMap<Res_CountryFeeCost, CountryFeeCostView>();
             CreateMap<OperationCountryFeeCostDto, Res_CountryFeeCost>();
             #endregion
+
             #region 物料供应商
             CreateMap<Edit_ResItemVendorDto, Res_ItemVendor>()
                  .ForMember(dest => dest.Address, opt => opt.MapFrom(src => src.VendorAddress))
@@ -276,6 +282,7 @@ namespace OASystem.Domain.AutoMappers
 
             CreateMap<Edit_ResItemInfoDto, Res_ItemDetailInfo>();
             #endregion
+
             #region 商邀资料
             CreateMap<OpInvitationOfficialActivityDto, Res_InvitationOfficialActivityData>();
             CreateMap<Res_InvitationOfficialActivityData, IOAInfoView>();
@@ -284,6 +291,7 @@ namespace OASystem.Domain.AutoMappers
             #region 公务出访
             CreateMap<OpOfficialActivitiesDto, Res_OfficialActivities>();
             #endregion
+
             #region 请示数据库
             CreateMap<OpAskDataDto, Res_AskData>();
             #endregion

OASystem/OASystem.Domain/Dtos/Resource/CountryFeeCostDto.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel.DataAnnotations;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -174,11 +175,55 @@ namespace OASystem.Domain.Dtos.Resource
         /// 备注
         /// </summary>
         public string Remark { get; set; }
-       
+
+
+
+        #region 2025-06-12 新增字段
+
+        /// <summary>
+        /// 签证费用类型 0 因公 1 因私
+        /// </summary>
+        public int VisaFeeType { get; set; } = 0;
+
+        /// <summary>
+        /// 云南代办费
+        /// </summary>
+        public decimal YunNanAgencyFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 贵州代办费
+        /// </summary>
+        public decimal GuiZhouAgencyFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 重庆代办费
+        /// </summary>
+        public decimal ChongQingAgencyFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 重庆外办出入境证明费用 - 普通
+        /// </summary>
+        public decimal ChongQingNormalFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 重庆外办出入境证明费用 - 加急
+        /// </summary>
+        public decimal ChongQingUrgentFee { get; set; } = 0.00m;
+
+        #endregion
+
     }
     public class DelCountryFeeCostDto
     {
         public int Id { get; set; }
         public int DeleteUserId { get; set; }
     }
+
+    public class QueryVisaCountryFeeCostsDto:DtoBase
+    {
+        [Range(-1,1,ErrorMessage = $"请选择正确的签证费用类型，-1：全部 0：因公 1：因私 ")]
+        public int VisaFeeType { get; set; }
+
+        public string CountryName { get; set; }
+    }
 }

OASystem/OASystem.Domain/Entities/Customer/Crm_DeleClient.cs

@@ -479,7 +479,7 @@ namespace OASystem.Domain.Entities.Customer
     }
 
 
-    public class groupClints {
+    public class GroupClints {
         public int Id { get; set; }
         public string Name { get; set; }
         /// <summary>

OASystem/OASystem.Domain/Entities/Resource/Res_CountryFeeCost.cs

@@ -105,7 +105,7 @@ namespace OASystem.Domain.Entities.Resource
         public string UrgentPriceDesc { get; set; }
 
         /// <summary>
-        /// 签证地址
+        /// 签证地址 -> 送签地址
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(255)")]
         public string VisaAddress { get; set; }
@@ -116,5 +116,44 @@ namespace OASystem.Domain.Entities.Resource
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(30)")]
         public string LastUpdateTime { get; set; } = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
 
+        #region 2025-06-12 新增字段
+
+        /// <summary>
+        /// 签证费用类型 0 因公 1 因私
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "int")]
+        public int VisaFeeType { get; set; } = 0;
+
+        /// <summary>
+        /// 云南代办费
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal YunNanAgencyFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 贵州代办费
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal GuiZhouAgencyFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 重庆代办费
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal ChongQingAgencyFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 重庆外办出入境证明费用 - 普通
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal ChongQingNormalFee { get; set; } = 0.00m;
+
+        /// <summary>
+        /// 重庆外办出入境证明费用 - 加急
+        /// </summary>
+        [SugarColumn(IsNullable = true, ColumnDataType = "decimal(10,2)")]
+        public decimal ChongQingUrgentFee { get; set; } = 0.00m;
+
+        #endregion
     }
 }

OASystem/OASystem.Domain/ViewModels/Resource/CountryFeeCostView.cs

@@ -1,13 +1,23 @@
 using OASystem.Domain.Entities.Resource;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OASystem.Domain.ViewModels.Resource
 {
-    public class CountryFeeCostView:Res_CountryFeeCost
+    public class CountryFeeCostView : Res_CountryFeeCost
     {
+        /// <summary>
+        /// 距今更新天数
+        /// </summary>
+        public int DaysSinceUpdate
+        {
+            get
+            {
+                var now = DateTime.Now;
+                if (!string.IsNullOrWhiteSpace(LastUpdateTime) && DateTime.TryParse(LastUpdateTime, out var lastTime))
+                {
+                    return (now - lastTime).Days;
+                }
+                return (now - CreateTime).Days;
+            }
+        }
     }
 }

OASystem/OASystem.Infrastructure/Repositories/Groups/VisaFeeInfoRepository.cs

@@ -195,7 +195,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     else if (item.OBType == 2) _pettyBusinessAgencyFee = item.AgencyFee;
                 }
 
-                var info = await _countryFeeRep._InfoByCountryName(country.Key);
+                var info = await _countryFeeRep.InfoByCountryName(country.Key);
                 if (info == null) //添加
                 {
                     int addId = _sqlSugar.Insertable(

OASystem/OASystem.Infrastructure/Repositories/Resource/CountryFeeRepository.cs

@@ -1,13 +1,7 @@
 using AutoMapper;
-using OASystem.Domain;
 using OASystem.Domain.Dtos.Resource;
 using OASystem.Domain.Entities.Resource;
 using OASystem.Domain.ViewModels.Resource;
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace OASystem.Infrastructure.Repositories.Resource
 {
@@ -19,64 +13,66 @@ namespace OASystem.Infrastructure.Repositories.Resource
             _mapper = mapper;
         }
 
-        public async Task<Res_CountryFeeCost> _InfoByCountryName(string CountryName)
+        public async Task<Res_CountryFeeCost> InfoByCountryName(string countryName)
         {
-            Res_CountryFeeCost _CountryFeeCost = new Res_CountryFeeCost();
-
-            if (string.IsNullOrEmpty(CountryName)) return _CountryFeeCost;
-
-            _CountryFeeCost = _sqlSugar.Queryable< Res_CountryFeeCost >().Where(it => it.VisaCountry.Equals(CountryName)).First();
-
-            return _CountryFeeCost;
-
+            if (string.IsNullOrEmpty(countryName)) return null;
+            return await _sqlSugar.Queryable<Res_CountryFeeCost>()
+                .FirstAsync(it => it.VisaCountry == countryName);
         }
 
 
-        public async Task<Result> OperationCountryFeeCost(OperationCountryFeeCostDto dto)
+        public async Task<JsonView> OperationCountryFeeCost(OperationCountryFeeCostDto dto)
         {
-            Result result = new Result() { Code = -2, Msg = "未知错误" };
+            var result = new JsonView() { Code = StatusCodes.Status400BadRequest, Msg = "未知错误" };
 
-            Res_CountryFeeCost _CountryFeeCost = _mapper.Map<Res_CountryFeeCost>(dto);
+            var countryFeeCost = _mapper.Map<Res_CountryFeeCost>(dto);
 
-            _CountryFeeCost.LastUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
+            countryFeeCost.LastUpdateTime = DateTime.Now.ToString("yyyy-MM-dd HH:mm:ss");
             if (dto.Status == 1)//添加
             {
-                string selectSql = string.Format(@"select * from Res_CountryFeeCost where VisaContinent='{0}' and VisaCountry='{1}' and IsDel='{2}'"
-                                                   , dto.VisaContinent, dto.VisaCountry, 0);
-                var CountryFeeCost = await _sqlSugar.SqlQueryable<Res_CountryFeeCost>(selectSql).FirstAsync();//查询是否存在
-                if (CountryFeeCost != null)
-                {
-                    return result = new Result() { Code = -1, Msg = "该国家已存在，请勿重复添加！" };
+                var exists = await _sqlSugar.Queryable<Res_CountryFeeCost>()
+                    .AnyAsync(x => x.IsDel == 0 &&
+                                   x.VisaFeeType == dto.VisaFeeType &&
+                                   x.VisaContinent == dto.VisaContinent &&
+                                   x.VisaCountry == dto.VisaCountry);
 
+                if (exists)
+                {
+                    result.Msg = "该国家已存在，请勿重复添加！";
+                    return result;
                 }
                 else//不存在，可添加
                 {
 
-                    int id = await AddAsyncReturnId(_CountryFeeCost);
+                    int id = await AddAsyncReturnId(countryFeeCost);
                     if (id == 0)
                     {
-                        return result = new Result() { Code = -1, Msg = "添加失败！" };
-
+                        result.Msg = "添加失败！";
+                        return result;
                     }
-                    result = new Result() { Code = 0, Msg = "添加成功！", Data = new { Id = id } };
+                    result.Code = StatusCodes.Status200OK;
+                    result.Msg = "添加成功！";
                 }
             }
             else if (dto.Status == 2)//修改
             {
-                var update = await _sqlSugar.Updateable(_CountryFeeCost)
-                                            .IgnoreColumns(it => new { it.Id, it.DeleteUserId, it.DeleteTime, it.CreateUserId, it.CreateTime, it.IsDel })
-                                            .Where(it => it.Id == _CountryFeeCost.Id)
-                                            .ExecuteCommandAsync();
+                var update = await _sqlSugar
+                    .Updateable(countryFeeCost)
+                    .IgnoreColumns(it => new { it.Id, it.DeleteUserId, it.DeleteTime, it.CreateUserId, it.CreateTime, it.IsDel })
+                    .Where(it => it.Id == countryFeeCost.Id)
+                    .ExecuteCommandAsync();
                 //bool res = await UpdateAsync(a => a.Id == dto.Id, a => _CountryFeeCost);
                 if (update < 1)
                 {
-                    return result = new Result() { Code = -1, Msg = "修改失败！" };
+                    result.Msg = "修改失败！";
+                    return result;
                 }
-                result = new Result() { Code = 0, Msg = "修改成功！" };
+                result.Code = StatusCodes.Status200OK;
+                result.Msg = "修改成功！";
             }
             else
             {
-                return result = new Result() { Code = -1, Msg = "请传入Status参数，1添加 2修改！" };
+                result.Msg = "请传入Status参数，1添加 2修改！";
             }
 
             return result;