From 739f5ae2c0dc879e70477e35aaf889855c5d28c2 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 12 Aug 2025 19:02:49 +0800 Subject: [PATCH] test . --- .../Controllers/AssignmentsController.cs | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs index e07d75e9..701f9714 100644 --- a/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs +++ b/Src/Dlhis.ScheduledTask/TaskAssignment/Controllers/AssignmentsController.cs @@ -1,4 +1,6 @@ -using Dlhis.Entity.Canteen.Entities; +using Dlhis.Entity.Basic.Entity; +using Dlhis.Entity.Basic.Enums; +using Dlhis.Entity.Canteen.Entities; using Dlhis.Entity.Canteen.Enums; using Dlhis.ScheduledTask.TaskAssignment.Request; using Dlhis.ScheduledTask.TaskAssignment.Response; @@ -71,15 +73,14 @@ public class AssignmentsController : ControllerBase [IgnoreTenant] public async Task Calc() { - var userCodes = await _dbContext.Queryable() - .Where(x => SqlFunc.Subqueryable().Where(p => p.UserCode == x.UserCode).NotAny()) - .Select(x => x.UserCode) + var s = new DateTime(2025, 7, 1); + var e = new DateTime(2025, 8, 1); + var userCodes = await _dbContext.Queryable().Where(x => x.ResignationDate.HasValue && x.ResignationDate >= s && x.ResignationDate <= e) + .Where(x => x.Type != GainfoUserTypeEnumType.External && x.Type != GainfoUserTypeEnumType.Outsource) + .Select(x => x.Code) .Distinct() - .Take(5000) .ToListAsync(); - var d = new DateTime(2025, 6, 30); - foreach (var userCode in userCodes) { if (!await _dbContext.Queryable().Where(x => x.UserCode == userCode).AnyAsync()) @@ -96,7 +97,8 @@ public class AssignmentsController : ControllerBase .Where(x => x.UserCode == userCode) .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) .Where(x => !BalanceRecordSourceConstants.IgnoreSources.Contains(x.Source)) - .Where(x => x.CostDate <= d) + .Where(x => x.CostDate >= s && x.CostDate <= e) + .Where(x => x.Type == BalanceRecordTypeEnumType.Out) .SumAsync(x => x.Amount); await _dbContext.Updateable()