From 520b2bd8ee4e946ffeb5b884e0c55511facda75c Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Sat, 8 Feb 2025 15:24:53 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B1=87=E9=80=9A=E4=BA=8C=E5=BC=80=E8=96=AA?= =?UTF-8?q?=E8=B5=84=E9=A1=B9=E7=9B=AE=E6=94=AF=E6=8C=81=E8=B7=A8=E4=B9=89?= =?UTF-8?q?=E5=8A=A1=E4=BA=BA=E5=8F=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/impl/SalaryAcctCalculateServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java index beae39aff..6707778f1 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java @@ -391,7 +391,8 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc // 根据薪资所属月获取上季度月份 LocalDateRange lastQuarterRange = SalaryDateUtil.getLastQuarterRange(salaryAcctRecordPO.getSalaryMonth()); // 获取义务人下所有账套 - List salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId()); + // List salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId()); + List salarySobPOS = getSalarySobService(user).listAll(); Set salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId); List salaryAcctRecordPOS = getSalaryAcctRecordService(user).listBySalarySobIdsAndSalaryMonth(salarySobIds, lastQuarterRange); // 过滤未归档的核算记录 @@ -434,7 +435,9 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc } }); // 获取义务人下所有账套 - List salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId()); + // List salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId()); + // 取所有账套 + List salarySobPOS = getSalarySobService(user).listAll(); Set salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId); // 3个时间范围 LocalDate salaryMonthLocalDate = SalaryDateUtil.dateToLocalDate(salaryAcctRecordPO.getSalaryMonth());