|
@@ -53,14 +53,10 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
var stids = new List<int>() { 17, 66, 91 };
|
|
|
var setData = _sqlSugar.Queryable<Sys_SetData>().Where(x => x.IsDel == 0 && stids.Contains(x.STid)).ToList();
|
|
|
|
|
|
- var groupInfo = _sqlSugar.Queryable<Grp_GroupCostParameter>().Where(x => x.IsDel == 0 && x.DiId == diId).First();
|
|
|
- if (groupInfo == null) { _view.Msg = $"团组成本信息未填写!"; return _view; }
|
|
|
- string _teamCurrency = groupInfo.Currency;
|
|
|
- decimal _teamRate = groupInfo.Rate;
|
|
|
-
|
|
|
- //币种验证 统一为currencycode三字码
|
|
|
- if (int.TryParse(_teamCurrency, out int currency)) _teamCurrency = setData.Find(x => x.Id == currency)?.Name ?? "";
|
|
|
-
|
|
|
+ var groupInfo = new Grp_GroupCostParameter();
|
|
|
+ string _teamCurrency = string.Empty;
|
|
|
+ decimal _teamRate = 1.0000M;
|
|
|
+
|
|
|
var costContents = new List<GroupCostAuditView>();
|
|
|
var subFeeTypeIds = new int[] {
|
|
|
4, // 保险 82
|
|
@@ -68,6 +64,15 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
};
|
|
|
if (!subFeeTypeIds.Contains(feeType))
|
|
|
{
|
|
|
+ groupInfo = _sqlSugar.Queryable<Grp_GroupCostParameter>().Where(x => x.IsDel == 0 && x.DiId == diId).First();
|
|
|
+ if (groupInfo == null) { _view.Msg = $"团组成本信息未填写!"; return _view; }
|
|
|
+ _teamCurrency = groupInfo.Currency;
|
|
|
+ _teamRate = groupInfo.Rate;
|
|
|
+
|
|
|
+ //币种验证 统一为currencycode三字码
|
|
|
+ if (int.TryParse(_teamCurrency, out int currency)) _teamCurrency = setData.Find(x => x.Id == currency)?.Name ?? "";
|
|
|
+
|
|
|
+
|
|
|
string costContentSql = $"Select * From Grp_GroupCost";
|
|
|
costContents = _sqlSugar.SqlQueryable<GroupCostAuditView>(costContentSql).Where(x => x.IsDel == 0 && x.Diid == diId).ToList();
|
|
|
|
|
@@ -778,8 +783,8 @@ namespace OASystem.Infrastructure.Repositories.Groups
|
|
|
{
|
|
|
//撤销该条数据的自动审核 --> 该条数据的审核状态是自动审核 3 --> 0
|
|
|
var ccpInfo = _sqlSugar.Queryable<Grp_CreditCardPayment>()
|
|
|
- .Where(s => s.DIId == diId && s.CTable == type && s.CId == dataId && s.IsAuditGM == 3)
|
|
|
- .First();
|
|
|
+ .Where(s => s.DIId == diId && s.CTable == type && s.CId == dataId && s.IsAuditGM == 3)
|
|
|
+ .First();
|
|
|
if (ccpInfo != null)
|
|
|
{
|
|
|
var ccpUpdate = _sqlSugar.Updateable<Grp_CreditCardPayment>()
|