diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs index 372a5d9a..c1ef4fd7 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs @@ -13,6 +13,7 @@ using Kurisu.AspNetCore.DataAccess.SqlSugar.Aop; using Kurisu.AspNetCore.DataAccess.SqlSugar.Extensions; using Kurisu.AspNetCore.DataAccess.SqlSugar.Services; using Kurisu.AspNetCore.UnifyResultAndValidation.Aop; +using Kurisu.AspNetCore.Utils.Extensions; using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Mvc; using SqlSugar; @@ -230,7 +231,7 @@ public class AssignmentsController : ControllerBase public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest1 request) { var data = await _dbContext.Queryable() - .Where(x => x.SettleMonth == request.SettleMonth) + .Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401" && x.BusinessPlaceCode == request.BusinessPlaceCode) .Where(x => x.Valid) .FirstAsync(); @@ -266,7 +267,7 @@ public class AssignmentsController : ControllerBase public async Task ManuallySettlementSupplier1(ManuallySettlementSupplierRequest2 request) { var data = await _dbContext.Queryable() - .Where(x => x.SettleMonth == request.SettleMonth) + .Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401" && x.BusinessPlaceCode == request.BusinessPlaceCode) .Where(x => x.Valid) .FirstAsync(); @@ -303,6 +304,7 @@ public class AssignmentsController : ControllerBase { var page = await _dbContext.Queryable() .Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401") + .WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode)) .Where(x => x.Valid) .OrderByDescending(x => x.CreateTime) .Select() @@ -328,6 +330,7 @@ public class AssignmentsController : ControllerBase { var page = await _dbContext.Queryable() .Where(x => x.SettleMonth == request.SettleMonth && x.TenantId == "2401") + .WhereIF(request.BusinessPlaceCodes.IsPresent(), x => request.BusinessPlaceCodes.Contains(x.BusinessPlaceCode)) .OrderByDescending(x => x.CreateTime) .Select() .ToPageListAsync(request); diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/ManuallySettlementSupplierRequest.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/ManuallySettlementSupplierRequest.cs index f414fe08..1ba6483a 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Request/ManuallySettlementSupplierRequest.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Request/ManuallySettlementSupplierRequest.cs @@ -9,6 +9,8 @@ public class ManuallySettlementSupplierRequest1 [Range(0, double.MaxValue, ErrorMessage = "结算金额必须大于等于0")] public decimal Pay { get; set; } + + public Guid BusinessPlaceCode { get; set; } } public class ManuallySettlementSupplierRequest2 @@ -18,4 +20,6 @@ public class ManuallySettlementSupplierRequest2 [Range(0, double.MaxValue, ErrorMessage = "退款金额必须大于等于0")] public decimal Refund { get; set; } + + public Guid BusinessPlaceCode { get; set; } } \ No newline at end of file