From 80d970154023363040f60ff5ddbda54ee7ad3e66 Mon Sep 17 00:00:00 2001 From: liguoyang Date: Tue, 9 Dec 2025 17:44:48 +0800 Subject: [PATCH] fix . --- Src/Dlhis.ScheduledTask/Jobs/CostUploadJob.cs | 27 +++++++++++-------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/Src/Dlhis.ScheduledTask/Jobs/CostUploadJob.cs b/Src/Dlhis.ScheduledTask/Jobs/CostUploadJob.cs index a5c0c884..11b33f63 100644 --- a/Src/Dlhis.ScheduledTask/Jobs/CostUploadJob.cs +++ b/Src/Dlhis.ScheduledTask/Jobs/CostUploadJob.cs @@ -42,7 +42,7 @@ public class CostUploadJob : BaseJob .Distinct() .ToListAsync(); - Logger.LogInformation("CostUploadJob消费上传人员:{count}", userCodeAll.Count); + Logger.LogInformation("CostUploadJob消费上传人员:{count},统计区间为{s}{e}", userCodeAll.Count, s.ToString("yyyy-MM-dd"), endDayOfMonth.ToString("yyyy-MM-dd")); foreach (var userCodes in userCodeAll.Chunk(100)) { @@ -50,20 +50,25 @@ public class CostUploadJob : BaseJob foreach (var userCode in userCodes) { var balance = await DbContext.Queryable() - .Where(x => x.UserCode == userCode) - .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) - .Where(x => x.Type == BalanceRecordTypeEnumType.Out) - .Where(x => x.CostDate >= s && x.CostDate < e) - .Where(x => !BalanceRecordSourceConstants.IgnoreSources.Contains(x.Source)) - .SumAsync(x => x.Amount); + .Where(x => x.UserCode == userCode) + .Where(x => x.Status == BalanceRecordStatusEnumType.Valid) + .Where(x => x.Type == BalanceRecordTypeEnumType.Out) + .Where(x => x.CostDate >= s && x.CostDate < e) + .Where(x => !BalanceRecordSourceConstants.IgnoreSources.Contains(x.Source)) + .SumAsync(x => x.Amount); - if (balance == 0) + if (balance != 0) { - continue; + dict.Add(userCode, Math.Abs(balance)); } - - dict.Add(userCode, Math.Abs(balance)); } + + if (!dict.Any()) + { + Logger.LogInformation("CostUploadJob统计人员:{count}", dict.Count); + continue; + } + var request = new UploadCostRequest { Data = dict.Select(x => new UploadCostItemRequest