|
|
@@ -184,6 +184,9 @@ namespace OASystem.API.Controllers
|
|
|
.ToListAsync();
|
|
|
foreach (var item in _clientDatas) EncryptionProcessor.DecryptProperties(item);
|
|
|
|
|
|
+ var groupInfo = await _sqlSugar.Queryable<Grp_DelegationInfo>().Where(x => x.Id == _dto.DiId).FirstAsync();
|
|
|
+ var visitDate = groupInfo.VisitDate;
|
|
|
+
|
|
|
#endregion
|
|
|
|
|
|
#region 团组收入
|
|
|
@@ -611,7 +614,7 @@ ORDER BY
|
|
|
|
|
|
List<GroupCTGGRFeeView> groupCTGGRFeeViews = new List<GroupCTGGRFeeView>();
|
|
|
string CTGGRFeeSql = string.Empty;
|
|
|
- if (_dto.DiId > 2352)
|
|
|
+ if (visitDate > Convert.ToDateTime("2024-04-17"))
|
|
|
{
|
|
|
CTGGRFeeSql = string.Format(@"Select ctggr.Id As CTGGRId,ctggr.DiId As CTGGRDiId,ctggr.PriceName As Area,ctggrc.*,ctggrc.Price As PayMoney,
|
|
|
sd2.name As PaymentCurrency,ccp.PayPercentage,
|
yuanrf