|
|
@@ -228,63 +228,63 @@ namespace OASystem.API.Controllers
|
|
|
* 超支费用
|
|
|
*/
|
|
|
decimal exTotalAmount = 0.00M;
|
|
|
- string ecSql = string.Format(@"Select gec.Id As GECId,gec.DiId As GECDiId,gec.PriceName,(gec.PriceSum * gec.Coefficient) As PayMoney,sd1.Name As PaymentCurrency,
|
|
|
- (gec.PriceSum * gec.Coefficient * ccp.DayRate) As CNYPrice,ccp.DayRate,ccp.Payee,ccp.OrbitalPrivateTransfer,sd2.Name As PayWay,
|
|
|
- sd3.Name As CardType,ccp.IsPay,u.CnName As Applicant,gec.CreateTime
|
|
|
- From OA2023DB.dbo.Fin_GroupExtraCost gec
|
|
|
- Left Join Grp_CreditCardPayment ccp On 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
|
|
|
- Left Join Sys_Users u On ccp.CreateUserId = u.Id
|
|
|
- Where ccp.IsDel = 0 And ccp.CTable = 1015 {1} And ccp.DiId = {0} Order By CreateTime", _dto.DiId, _dto.isAudit ? "And ccp.IsAuditGM = 1 And ccp.IsPay = 1 " : " ");
|
|
|
-
|
|
|
- List<Gsd_ExtraCostsView> _ExtraCostsViews = await _sqlSugar.SqlQueryable<Gsd_ExtraCostsView>(ecSql).ToListAsync();
|
|
|
-
|
|
|
- #region 超支费用 - 模拟数据
|
|
|
-
|
|
|
- //if (_ExtraCostsViews.Count < 1)
|
|
|
- //{
|
|
|
- // _ExtraCostsViews.Add(new Gsd_ExtraCostsView()
|
|
|
- // {
|
|
|
- // GECId = 0,
|
|
|
- // GECDiId = 2334,
|
|
|
- // PriceName = "模拟数据-超支费用名称",
|
|
|
- // PayMoney = 1000.00M,
|
|
|
- // PaymentCurrency = "CNY",
|
|
|
- // DayRate = 1.0000M,
|
|
|
- // CNYPrice = 1000.00M,
|
|
|
- // Payee = "模拟数据-超支费用收款方",
|
|
|
- // OrbitalPrivateTransfer = 1,
|
|
|
- // PayWay = "刷卡",
|
|
|
- // CardType = "招行卡",
|
|
|
- // IsPay = 1,
|
|
|
- // Applicant = "刘华举"
|
|
|
- // });
|
|
|
- // _ExtraCostsViews.Add(new Gsd_ExtraCostsView()
|
|
|
- // {
|
|
|
- // GECId = 0,
|
|
|
- // GECDiId = 2334,
|
|
|
- // PriceName = "模拟数据-超支费用名称",
|
|
|
- // PayMoney = 1000.00M,
|
|
|
- // PaymentCurrency = "CNY",
|
|
|
- // DayRate = 1.0000M,
|
|
|
- // CNYPrice = 1000.00M,
|
|
|
- // Payee = "模拟数据-超支费用收款方",
|
|
|
- // OrbitalPrivateTransfer = 1,
|
|
|
- // PayWay = "刷卡",
|
|
|
- // CardType = "招行卡",
|
|
|
- // IsPay = 1,
|
|
|
- // Applicant = "刘华举"
|
|
|
- // });
|
|
|
- //}
|
|
|
- #endregion
|
|
|
-
|
|
|
-
|
|
|
- exTotalAmount = _ExtraCostsViews.Sum(it => it.CNYPrice);
|
|
|
-
|
|
|
- _giView.ExtraCostsViews = _ExtraCostsViews;
|
|
|
- _giView.ExtraCostsStr = string.Format(@"人民币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1().ToString("#0.00"));
|
|
|
+ // string ecSql = string.Format(@"Select gec.Id As GECId,gec.DiId As GECDiId,gec.PriceName,(gec.PriceSum * gec.Coefficient) As PayMoney,sd1.Name As PaymentCurrency,
|
|
|
+ // (gec.PriceSum * gec.Coefficient * ccp.DayRate) As CNYPrice,ccp.DayRate,ccp.Payee,ccp.OrbitalPrivateTransfer,sd2.Name As PayWay,
|
|
|
+ // sd3.Name As CardType,ccp.IsPay,u.CnName As Applicant,gec.CreateTime
|
|
|
+ //From OA2023DB.dbo.Fin_GroupExtraCost gec
|
|
|
+ //Left Join Grp_CreditCardPayment ccp On 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
|
|
|
+ // Left Join Sys_Users u On ccp.CreateUserId = u.Id
|
|
|
+ //Where ccp.IsDel = 0 And ccp.CTable = 1015 {1} And ccp.DiId = {0} Order By CreateTime", _dto.DiId, _dto.isAudit ? "And ccp.IsAuditGM = 1 And ccp.IsPay = 1 " : " ");
|
|
|
+
|
|
|
+ // List<Gsd_ExtraCostsView> _ExtraCostsViews = await _sqlSugar.SqlQueryable<Gsd_ExtraCostsView>(ecSql).ToListAsync();
|
|
|
+
|
|
|
+ // #region 超支费用 - 模拟数据
|
|
|
+
|
|
|
+ // //if (_ExtraCostsViews.Count < 1)
|
|
|
+ // //{
|
|
|
+ // // _ExtraCostsViews.Add(new Gsd_ExtraCostsView()
|
|
|
+ // // {
|
|
|
+ // // GECId = 0,
|
|
|
+ // // GECDiId = 2334,
|
|
|
+ // // PriceName = "模拟数据-超支费用名称",
|
|
|
+ // // PayMoney = 1000.00M,
|
|
|
+ // // PaymentCurrency = "CNY",
|
|
|
+ // // DayRate = 1.0000M,
|
|
|
+ // // CNYPrice = 1000.00M,
|
|
|
+ // // Payee = "模拟数据-超支费用收款方",
|
|
|
+ // // OrbitalPrivateTransfer = 1,
|
|
|
+ // // PayWay = "刷卡",
|
|
|
+ // // CardType = "招行卡",
|
|
|
+ // // IsPay = 1,
|
|
|
+ // // Applicant = "刘华举"
|
|
|
+ // // });
|
|
|
+ // // _ExtraCostsViews.Add(new Gsd_ExtraCostsView()
|
|
|
+ // // {
|
|
|
+ // // GECId = 0,
|
|
|
+ // // GECDiId = 2334,
|
|
|
+ // // PriceName = "模拟数据-超支费用名称",
|
|
|
+ // // PayMoney = 1000.00M,
|
|
|
+ // // PaymentCurrency = "CNY",
|
|
|
+ // // DayRate = 1.0000M,
|
|
|
+ // // CNYPrice = 1000.00M,
|
|
|
+ // // Payee = "模拟数据-超支费用收款方",
|
|
|
+ // // OrbitalPrivateTransfer = 1,
|
|
|
+ // // PayWay = "刷卡",
|
|
|
+ // // CardType = "招行卡",
|
|
|
+ // // IsPay = 1,
|
|
|
+ // // Applicant = "刘华举"
|
|
|
+ // // });
|
|
|
+ // //}
|
|
|
+ // #endregion
|
|
|
+
|
|
|
+
|
|
|
+ // exTotalAmount = _ExtraCostsViews.Sum(it => it.CNYPrice);
|
|
|
+
|
|
|
+ // _giView.ExtraCostsViews = _ExtraCostsViews;
|
|
|
+ // _giView.ExtraCostsStr = string.Format(@"人民币总费用：{0} CNY", exTotalAmount.ConvertToDecimal1().ToString("#0.00"));
|
|
|
|
|
|
/*
|
|
|
* 收款退还
|
