解决机票费用录入修改后提交问题

OASystem/OASystem.Domain/Dtos/Groups/AirTicketResDto.cs

@@ -161,7 +161,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 消费日期
         /// </summary>
-        public DateTime ConsumptionDate { get; set; }
+        public string ConsumptionDate { get; set; }
         /// <summary>
         /// 卡类型
         /// </summary>
@@ -209,7 +209,7 @@ namespace OASystem.Domain.Dtos.Groups
         /// <summary>
         /// 财务操作时间
         /// </summary>
-        public DateTime MFOperatorDate { get; set; }
+        public string MFOperatorDate { get; set; }
         ///// <summary>
         ///// 部门经理是否审核 0否1是
         ///// </summary>

OASystem/OASystem.Domain/Entities/Groups/Grp_CreditCardPayment.cs

@@ -116,7 +116,7 @@ namespace OASystem.Domain.Entities.Groups
         /// 财务部审核时间
         /// </summary>
         [SugarColumn(IsNullable = true, ColumnDataType = "varchar(50)")]
-        public string? AuditMFDate { get; set; }
+        public string  AuditMFDate { get; set; }
 
         /// <summary>
         /// 总经理是否审核  0 未审核 1已通过 2未通过

OASystem/OASystem.Infrastructure/Repositories/Groups/AirTicketResRepository.cs

@@ -82,7 +82,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             {
                 string sql = string.Format(@"select a.*,c.IsAuditGM,(select Name from Sys_SetData where Id=a.cType) as 'CTypeName',(select Name from 
                                                 Sys_SetData where Id=a.PreCurrency) as 'PreCurrencyStr',(select Name from Sys_SetData where Id=a.Currency)
-                                                as 'CurrencyStr' from Grp_AirTicketReservations a,Grp_CreditCardPayment c where  a.id=c.CId  and a.isdel={1}
+                                                as 'CurrencyStr' from Grp_AirTicketReservations a,Grp_CreditCardPayment c where  a.id=c.CId  and a.isdel={1} and c.IsDel={1}
                                                 and a.DIId={0} Order By a.CreateTime desc", dto.DiId, 0);
                 List<AirTicketReservationsView> _AirTicketReservations = _sqlSugar.SqlQueryable<AirTicketReservationsView>(sql).ToList();
 
@@ -321,8 +321,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 Grp_AirTicketReservations grp_AirTicket = _mapper.Map<Grp_AirTicketReservations>(dto.AirTicketResOpData);
                 if (dto.Status == 1)
                 {
-                    string selectSql = string.Format(@"select * from Grp_AirTicketReservations where ClientName='{0}' and IsDel={1}"
-                                                     , dto.AirTicketResOpData.ClientName, 0);
+                    string selectSql = string.Format(@"select * from Grp_AirTicketReservations where ClientName='{0}' and IsDel={1} and FlightsCode='{2}'"
+                                                     , dto.AirTicketResOpData.ClientName, 0,dto.AirTicketResOpData.FlightsCode);
                     var DeleClient = await _sqlSugar.SqlQueryable<Grp_AirTicketReservations>(selectSql).FirstAsync();//查询是否存在
                     if (DeleClient != null)
                     {
@@ -378,19 +378,32 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel == 0);
                         if (grp_AirTicket.CType == 460)//经济舱
                         {
-                            if (Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
+                            if (_GroupCostParameter != null)
                             {
-                                grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
-                                grp_CreditCard.IsAuditGM = 3;//3 为自动审核
-                                grp_CreditCard.AuditGMOperate = 0;
-                                grp_CreditCard.AuditGMDate = "";
-                                grp_CreditCard.IsPay = 0;
+
+                                if (Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
+                                {
+                                    grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
+                                    grp_CreditCard.IsAuditGM = 3;//3 为自动审核
+                                    grp_CreditCard.AuditGMOperate = 0;
+                                    grp_CreditCard.AuditGMDate = "";
+                                    grp_CreditCard.IsPay = 0;
+                                }
+                                else
+                                {
+                                    var a = grp_CreditCard.RMBPrice - Convert.ToDecimal(_GroupCostParameter.JJCCB);
+                                    var b = a / Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum);
+                                    grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
+                                    grp_CreditCard.IsAuditGM = 0;//3 为自动审核
+                                    grp_CreditCard.AuditGMOperate = 21;
+                                    grp_CreditCard.AuditGMDate = "";
+                                    grp_CreditCard.IsPay = 0;
+                                }
+
                             }
                             else
                             {
-                                var a = grp_CreditCard.RMBPrice - Convert.ToDecimal(_GroupCostParameter.JJCCB);
-                                var b = a / Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum);
-                                grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
+                                grp_CreditCard.ExceedBudget = 0.00M;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
                                 grp_CreditCard.AuditGMDate = "";
@@ -400,27 +413,46 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         }
                         else if (grp_AirTicket.CType == 458)
                         {
-                            if (Convert.ToDecimal(_GroupCostParameter.GWCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
+                            if (_GroupCostParameter != null)
                             {
-                                grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
-                                grp_CreditCard.IsAuditGM = 3;//3 为自动审核
-                                grp_CreditCard.AuditGMOperate = 21;
-                                grp_CreditCard.AuditGMDate = "";
-                                grp_CreditCard.IsPay = 0;
+
+
+                                if (Convert.ToDecimal(_GroupCostParameter.GWCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
+                                {
+                                    grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
+                                    grp_CreditCard.IsAuditGM = 3;//3 为自动审核
+                                    grp_CreditCard.AuditGMOperate = 21;
+                                    grp_CreditCard.AuditGMDate = "";
+                                    grp_CreditCard.IsPay = 0;
+                                }
+                                else
+                                {
+                                    var a = grp_CreditCard.RMBPrice - Convert.ToDecimal(_GroupCostParameter.GWCB);
+                                    var b = a / Convert.ToDecimal(_GroupCostParameter.GWCB) * Convert.ToDecimal(grp_AirTicket.ClientNum);
+                                    grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
+                                    grp_CreditCard.IsAuditGM = 0;//3 为自动审核
+                                    grp_CreditCard.AuditGMOperate = 21;
+                                    grp_CreditCard.AuditGMDate = "";
+                                    grp_CreditCard.IsPay = 0;
+                                }
                             }
                             else
                             {
-                                var a = grp_CreditCard.RMBPrice - Convert.ToDecimal(_GroupCostParameter.GWCB);
-                                var b = a / Convert.ToDecimal(_GroupCostParameter.GWCB) * Convert.ToDecimal(grp_AirTicket.ClientNum);
-                                grp_CreditCard.ExceedBudget = b;// 超出预算比例 换算
+                                grp_CreditCard.ExceedBudget = 0.00M;// 超出预算比例 换算
                                 grp_CreditCard.IsAuditGM = 0;//3 为自动审核
                                 grp_CreditCard.AuditGMOperate = 21;
                                 grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 0;
                             }
                         }
-
-
+                        else
+                        {
+                            grp_CreditCard.ExceedBudget = 0.00M;// 超出预算比例 换算
+                            grp_CreditCard.IsAuditGM = 0;//3 为自动审核
+                            grp_CreditCard.AuditGMOperate = 21;
+                            grp_CreditCard.AuditGMDate = "";
+                            grp_CreditCard.IsPay = 0;
+                        }
                         grp_CreditCard.CId = id;
                         grp_CreditCard.CTable = 85;
                         grp_CreditCard.PayPercentage = 100;
@@ -521,6 +553,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         Grp_GroupCostParameter _GroupCostParameter = _sqlSugar.Queryable<Grp_GroupCostParameter>().First(a => a.DiId == grp_AirTicket.DIId && a.IsDel == 0);
                         if (grp_AirTicket.CType == 460)//经济舱
                         {
+                            if (_GroupCostParameter != null)
+                            {
+
+                            
                             if (Convert.ToDecimal(_GroupCostParameter.JJCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
                             {
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算
@@ -539,10 +575,29 @@ namespace OASystem.Infrastructure.Repositories.Groups
                                 grp_CreditCard.AuditGMDate = "";
                                 grp_CreditCard.IsPay = 1;
                             }
-
+                            }
+                            else
+                            {
+                                grp_CreditCard.ExceedBudget = 0.00M;// 超出预算比例 换算
+                                grp_CreditCard.IsAuditGM = 0;//3 为自动审核
+                                grp_CreditCard.AuditGMOperate = 21;
+                                grp_CreditCard.AuditGMDate = "";
+                                grp_CreditCard.IsPay = 0;
+                            }
                         }
                         else if (grp_AirTicket.CType == 458)
                         {
+                            if (_GroupCostParameter != null)
+                            {
+                            }
+                            else
+                            {
+                                grp_CreditCard.ExceedBudget = 0.00M;// 超出预算比例 换算
+                                grp_CreditCard.IsAuditGM = 0;//3 为自动审核
+                                grp_CreditCard.AuditGMOperate = 21;
+                                grp_CreditCard.AuditGMDate = "";
+                                grp_CreditCard.IsPay = 0;
+                            }
                             if (Convert.ToDecimal(_GroupCostParameter.GWCCB) * Convert.ToDecimal(grp_AirTicket.ClientNum) > grp_CreditCard.RMBPrice)
                             {
                                 grp_CreditCard.ExceedBudget = 0;// 超出预算比例 换算