|
|
@@ -52,6 +52,7 @@ using MathNet.Numerics.Distributions;
|
|
|
using System.Diagnostics.Metrics;
|
|
|
using EyeSoft.Collections.Generic;
|
|
|
using Microsoft.Extensions.Hosting;
|
|
|
+using System.Runtime.Intrinsics.Arm;
|
|
|
|
|
|
namespace OASystem.API.Controllers
|
|
|
{
|
|
|
@@ -355,6 +356,37 @@ namespace OASystem.API.Controllers
|
|
|
|
|
|
return Ok(JsonView(true));
|
|
|
}
|
|
|
+
|
|
|
+ /// <summary>
|
|
|
+ /// 日付申请
|
|
|
+ /// 总经理未审核 日付信息
|
|
|
+ /// </summary>
|
|
|
+ /// <param name="dto"> dto </param>
|
|
|
+ /// <returns></returns>
|
|
|
+ [HttpGet]
|
|
|
+ [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
|
|
|
+ public async Task<IActionResult> DailyPaymentGMUnAudited()
|
|
|
+ {
|
|
|
+ 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)
|
|
|
+ .OrderBy(dfp => dfp.CreateTime, 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 ? "审核未通过" : "未审核",
|
|
|
+ fAuditDate = dfp.FAuditDate,
|
|
|
+ applicant = u.CnName,
|
|
|
+ applicantDate = dfp.CreateTime
|
|
|
+ })
|
|
|
+ .ToListAsync();
|
|
|
+
|
|
|
+ int count = dailyInfos.Count;
|
|
|
+ return Ok(JsonView(true,"查询成功", dailyInfos, count));
|
|
|
+ }
|
|
|
+
|
|
|
#endregion
|
|
|
|
|
|
#region 团组提成
|
