团组模块 出入境费用 子表 修改

OASystem/OASystem.Domain/AutoMappers/_baseMappingProfile.cs

@@ -105,7 +105,7 @@ namespace OASystem.Domain.AutoMappers
 
             CreateMap<Grp_EnterExitCost, EnterExitCostInfoView>();
             CreateMap<EnterExitCostOperateDto, Grp_EnterExitCost>();
-            CreateMap<DayAndCostInfoView, Grp_DayAndCost>();
+            CreateMap<DayAndCostAddView, Grp_DayAndCost>();
 
             #endregion
 

OASystem/OASystem.Domain/Dtos/Groups/EnterExitCostDto.cs

@@ -156,7 +156,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 住宿费子项Data
         /// </summary>
-        public List<DayAndCostInfoView>? QuarterageData { get; set; }
+        public List<DayAndCostAddView>? QuarterageData { get; set; }
 
         #endregion
 
@@ -170,7 +170,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 伙食费子项Data
         /// </summary>
-        public List<DayAndCostInfoView>? BoardWagesData { get; set; }
+        public List<DayAndCostAddView>? BoardWagesData { get; set; }
 
         #endregion
 
@@ -184,7 +184,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 公杂费子项Data
         /// </summary>
-        public List<DayAndCostInfoView>? MiscellaneousFeeData { get; set; }
+        public List<DayAndCostAddView>? MiscellaneousFeeData { get; set; }
 
         #endregion
 
@@ -198,11 +198,10 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 培训费子项Data
         /// </summary>
-        public List<DayAndCostInfoView>? TrainingExpenseData { get; set; }
+        public List<DayAndCostAddView>? TrainingExpenseData { get; set; }
 
         #endregion
 
-
         #region 最下面 选择框状态
 
         /// <summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_DayAndCost.cs

@@ -37,7 +37,7 @@ namespace OASystem.Domain.Entities.Groups
         public int NationalTravelFeeId { get; set; }
 
         /// <summary>
-        /// 地名
+        /// 地名 - 弃用字段不删
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(100)")]
         public string? Place { get; set; }

OASystem/OASystem.Domain/ViewModels/Groups/EnterExitCostView.cs

@@ -270,7 +270,7 @@ namespace OASystem.Domain.ViewModels.Groups
     public class DayAndCostInfoView
     {
         /// <summary>
-        /// 
+        /// Id
         /// </summary>
         public int Id { get; set; }
 
@@ -305,10 +305,42 @@ namespace OASystem.Domain.ViewModels.Groups
         /// </summary>
         public int Days { get; set; }
 
+        /// <summary>
+        /// 出入境国家费用标准 - Id
+        /// </summary>
+        public int NationalTravelFeeId { get; set; }
+
+        /// <summary>
+        /// 出入境国家费用标准 - 国家
+        /// </summary>
+        public string? Country { get; set; }
+
+        /// <summary>
+        /// 出入境国家费用标准 - 城市
+        /// </summary>
+        public string? City { get; set; }
+
+        ///// <summary>
+        ///// 地名
+        ///// </summary>
+        //public string? Place { get; set; }
+
         /// <summary>
         /// 地名
         /// </summary>
-        public string? Place { get; set; }
+        public string? PlaceName
+        {
+            get
+            {
+                string str = "";
+
+                if (City.Contains("城市")) str = Country;
+                else str = City;
+
+                return str;
+
+            }
+        }
 
         /// <summary>
         /// 费用标准
@@ -335,9 +367,66 @@ namespace OASystem.Domain.ViewModels.Groups
         /// 小计
         /// </summary>
         public decimal SubTotal { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; } = "";
     }
 
 
+    /// <summary>
+    /// 出入境国家(城市)费用标准子项Add  View
+    /// </summary>
+    public class DayAndCostAddView
+    {
+        /// <summary>
+        /// 主键编号
+        /// </summary>
+        public int Id { get; set; }
+
+        /// <summary>
+        /// 团组Id
+        /// </summary>
+        public int DiId { get; set; }
+
+        /// <summary>
+        /// 类型:1为住宿费;2为伙食费;3为公杂费;4培训费用
+        /// </summary>
+        public int Type { get; set; }
+
+        /// <summary>
+        /// 天数
+        /// </summary>
+        public int Days { get; set; }
+
+        /// <summary>
+        /// 出入境国家费用标准 - Id
+        /// </summary>
+        public int NationalTravelFeeId { get; set; }
+
+        /// <summary>
+        /// 费用标准
+        /// </summary>
+        public decimal Cost { get; set; }
+
+        /// <summary>
+        /// 币种 Id
+        /// Sys_SetData STid = 66
+        /// </summary>
+        public int Currency { get; set; }
+
+        /// <summary>
+        /// 小计
+        /// </summary>
+        public decimal SubTotal { get; set; }
+
+        /// <summary>
+        /// 备注
+        /// </summary>
+        public string? Remark { get; set; } = "";
+    }
+
     /// <summary>
     /// 币种详情
     /// </summary>

OASystem/OASystem.Infrastructure/Repositories/Groups/EnterExitCostRepository.cs

@@ -82,9 +82,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 {
                     enterExitCostInfoView = _mapper.Map<EnterExitCostInfoView>(enterExitCostData);
 
-                    var dayAndCostSql = string.Format(@"Select ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCost gdac
-                                                Left Join Sys_SetData ssd On ssd.STid = 66 And gdac.Currency = ssd.Id
-                                                Where gdac.Isdel = 0 And gdac.DiId = {0} Order By [Type] ASC,[Days] ASC", dto.DiId);
+                    var dayAndCostSql = string.Format(@"Select ntf.Country,ntf.City,ssd.Name CurremcyCode,ssd.Remark CurrencyName,gdac.* From Grp_DayAndCost gdac
+                                                        Left Join Grp_NationalTravelFee ntf On ntf.Id = gdac.NationalTravelFeeId
+                                                        Left Join Sys_SetData ssd On ssd.STid = 66 And gdac.Currency = ssd.Id
+                                                        Where gdac.Isdel = 0 And gdac.DiId = {0} Order By [Type] ASC,[Days] ASC", dto.DiId);
                     var dayAndCostData = await _sqlSugar.SqlQueryable<DayAndCostInfoView>(dayAndCostSql).ToListAsync();