|
|
@@ -369,15 +369,20 @@ namespace OASystem.API.Controllers
|
|
|
{
|
|
|
var dailyInfos = await _sqlSugar.Queryable<Fin_DailyFeePayment>()
|
|
|
.LeftJoin<Sys_Users>((dfp, u) => dfp.CreateUserId == u.Id)
|
|
|
- .Where(dfp => dfp.IsDel == 0 && dfp.IsPay == 0 && dfp.FAudit == 1 && dfp.MAudit != 1)
|
|
|
+ //.Where(dfp => dfp.IsDel == 0 && dfp.IsPay == 0 && dfp.FAudit == 1 && dfp.MAudit != 1)
|
|
|
+ .Where(dfp => dfp.IsDel == 0 &&
|
|
|
+ dfp.IsPay == 0 &&
|
|
|
+ dfp.MAudit != 1
|
|
|
+ )
|
|
|
.OrderBy(dfp => dfp.CreateTime, OrderByType.Desc)
|
|
|
- .OrderBy(dfp => dfp.FAudit, OrderByType.Desc)
|
|
|
+ //.OrderBy(dfp => dfp.FAudit, OrderByType.Desc)
|
|
|
.Select((dfp, u) => new
|
|
|
{
|
|
|
id = dfp.Id,
|
|
|
amountName = dfp.Instructions,
|
|
|
amount = dfp.SumPrice,
|
|
|
- fAuditStatus = dfp.FAudit == 1 ? "审核通过" : dfp.FAudit == 2 ? "审核未通过" : "未审核",
|
|
|
+ fAuditStatus = dfp.FAudit == 1 ? "审核通过" :
|
|
|
+ dfp.FAudit == 2 ? "审核未通过" : "未审核",
|
|
|
fAuditDate = dfp.FAuditDate,
|
|
|
applicant = u.CnName,
|
|
|
applicantDate = dfp.CreateTime
|
