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());