update 地接费用录入

OASystem/OASystem.Domain/Dtos/Groups/CarTouristGuideGroundDto.cs

@@ -171,6 +171,21 @@ namespace OASystem.Domain.Dtos.Groups
         /// 汇率
         /// </summary>
         public decimal Rate { get; set; }
+
+        //-----------------------------------
+
+
+        public string ConsumptionPatterns { get; set; } // 消费方式
+        public int Ctdid { get; set; } // 卡类型
+        public string BankNo { get; set; } // 银行卡号
+        public string CardholderName { get; set; } // 持卡人姓名
+        public string ConsumptionDate { get; set; } // 消费日期
+        public string CompanyBankNo { get; set; } // 公司银行账号
+        public string OtherBankName { get; set; } // 对方开户行
+        public string OtherSideNo { get; set; } // 对方银行卡号
+        public string OtherSideName { get; set; } // 对方姓名
+
+
     }
     public class OPContentList
     {

OASystem/OASystem.Domain/ViewModels/Groups/CarTouristCreditCardPaymentView.cs

@@ -53,6 +53,17 @@ namespace OASystem.Domain.ViewModels.Groups
         /// GM是否审核
         /// </summary>
         public int IsAuditGM { get; set; }
+
+
+        public string ConsumptionPatterns { get; set; } // 消费方式
+        public int Ctdid { get; set; } // 卡类型
+        public string BankNo { get; set; } // 银行卡号
+        public string CardholderName { get; set; } // 持卡人姓名
+        public string ConsumptionDate { get; set; } // 消费日期
+        public string CompanyBankNo { get; set; } // 公司银行账号
+        public string OtherBankName { get; set; } // 对方开户行
+        public string OtherSideNo { get; set; } // 对方银行卡号
+        public string OtherSideName { get; set; } // 对方姓名
     }
 
     public class CarTouristGuideGroundReservationsContentView

OASystem/OASystem.Infrastructure/Repositories/Groups/CarTouristGuideGroundRepository.cs

@@ -315,7 +315,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     PayName = s1.Name,
                     PaymentCurrencyName = s2.Name,
                     OrbitalPrivateTransfer = g.OrbitalPrivateTransfer,
-                    OrbitalPrivateTransferStr = g.OrbitalPrivateTransfer == 0 ? "公转" : "私转"
+                    OrbitalPrivateTransferStr = g.OrbitalPrivateTransfer == 0 ? "公转" : "私转",
+                    BankNo = g.BankNo,
+                    CardholderName = g.CardholderName,
+                    CompanyBankNo = g.CompanyBankNo,
+                    ConsumptionDate = g.ConsumptionDate,
+                    ConsumptionPatterns = g.ConsumptionPatterns,
+                    Ctdid = g.CTDId,
+                    OtherBankName = g.OtherBankName,
+                    OtherSideName = g.OtherSideName,
+                    OtherSideNo = g.OtherSideNo,
                 })
                 .First();
 
@@ -472,6 +481,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
                     grpCarOp.toCurr
                 };
 
+                var bankCard = _sqlSugar.Queryable<Sys_SetData>().Where(x => x.IsDel == 0 && x.STid == 15)
+                    .Select(x=> new
+                            {
+                                x.Id,
+                                x.Name
+                            })
+                    .OrderByDescending(x=>x.Id)
+                    .ToList();
+
                 if (dto.PortType == 1)
                 {
                     var data = new
@@ -486,7 +504,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         checkedItem,
                         existItem = _TableInitialization.Select(x => x.Name).ToList(),
                         NationalTravelFee,
-                        rate
+                        rate,
+                        bankCard
                     };
 
                     return result = new Result() { Code = 0, Msg = "查询成功", Data = data };
@@ -503,7 +522,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         ssdv,
                         checkedItemId,
                         NationalTravelFee,
-                        rate
+                        rate,
+                        bankCard
                     };
                     return result = new Result() { Code = 0, Msg = "查询成功", Data = data };
                 }
@@ -1104,6 +1124,17 @@ namespace OASystem.Infrastructure.Repositories.Groups
                 c.Payee = dto.Payee;
                 c.CreateUserId = dto.CreateUserId;
 
+                //--------------------添加C表字段---------------
+                c.ConsumptionPatterns = dto.ConsumptionPatterns;
+                c.CTDId = dto.Ctdid;
+                c.BankNo = dto.BankNo;
+                c.CardholderName = dto.CardholderName;
+                c.ConsumptionDate = dto.ConsumptionDate;
+                c.CompanyBankNo = dto.CompanyBankNo;
+                c.OtherBankName = dto.OtherBankName;
+                c.OtherSideNo = dto.OtherSideNo;
+                c.OtherSideName = dto.OtherSideName;
+
                 if (c.PayDId == 72) c.IsPay = 1;
                 else c.IsPay = 0;
 
@@ -1157,6 +1188,16 @@ namespace OASystem.Infrastructure.Repositories.Groups
                         IsPay = c.IsPay,
                         RMBPrice = c.RMBPrice,
                         DayRate = c.DayRate,
+                        //添加属性
+                        ConsumptionPatterns = c.ConsumptionPatterns,
+                        CTDId = c.CTDId,
+                        BankNo = c.BankNo,
+                        CardholderName = c.CardholderName,
+                        ConsumptionDate = c.ConsumptionDate,
+                        CompanyBankNo = c.CompanyBankNo,
+                        OtherBankName = c.OtherBankName,
+                        OtherSideNo = c.OtherSideNo,
+                        OtherSideName = c.OtherSideName
 
                     }).ExecuteCommandAsync();
                     noticeSign = 2;