|
@@ -208,7 +208,7 @@ namespace OASystem.API.Controllers
|
|
|
ccp.RMBPrice As CNYPrice,ccp.DayRate,ccp.Payee,ccp.OrbitalPrivateTransfer,sd2.Name As PayWay,
|
|
|
sd3.Name As CardType,ccp.IsPay,u.CnName As Applicant
|
|
|
From Fin_GroupExtraCost gec
|
|
|
- Left Join Grp_CreditCardPayment ccp On ccp.isdel = 0 And ccp.CTable = 81 And gec.Id = ccp.CId
|
|
|
+ Left Join Grp_CreditCardPayment ccp On ccp.isdel = 0 And ccp.CTable = 1015 And gec.Id = ccp.CId
|
|
|
Left Join Sys_SetData sd1 On ccp.PaymentCurrency = sd1.Id
|
|
|
Left Join Sys_SetData sd2 On ccp.PayDId = sd2.Id
|
|
|
Left Join Sys_SetData sd3 On ccp.CTDId = sd3.Id
|
|
@@ -268,13 +268,14 @@ namespace OASystem.API.Controllers
|
|
|
decimal promTotalAmount = 0.00M;// 收款退还总金额
|
|
|
List<Gsd_PaymentRefundAndOtherMoneyView> _promView = new List<Gsd_PaymentRefundAndOtherMoneyView>();
|
|
|
|
|
|
+ //删除了 And prom.PriceType = 1
|
|
|
string _ropSql = string.Format(@"Select u.CnName As Appliction,prom.Id As PrId,prom.DiId As PrDiId,prom.Price As PrPrice,
|
|
|
prom.PriceName AS PrPriceName,prom.CurrencyId As PrCurrencyId,
|
|
|
prom.PayType As PrPayType,prom.PriceType As PrPriceType,ccp.*
|
|
|
From Fin_PaymentRefundAndOtherMoney prom
|
|
|
Left Join Grp_CreditCardPayment ccp On prom.DiId = ccp.DIId And prom.Id = ccp.CId
|
|
|
Left Join Sys_Users u On ccp.CreateUserId = u.Id
|
|
|
- Where prom.IsDel = 0 And prom.PayType = 1 And prom.PriceType = 1 And ccp.CTable = 285
|
|
|
+ Where prom.IsDel = 0 And prom.PayType = 1 And ccp.CTable = 285
|
|
|
And ccp.IsAuditGM = 1 And ccp.IsPay = 1
|
|
|
And prom.DiId = {0}", _dto.DiId);
|
|
|
var _promDatas = await _sqlSugar.SqlQueryable<Gsd_PaymentRefundAndOtherMoneyDataSource1View>(_ropSql).ToListAsync();
|