qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

汇通二开薪资项目支持跨义务人取

This commit is contained in:
Harryxzy 2025-02-08 15:24:53 +08:00
parent a3137940a3
commit 520b2bd8ee
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java
View File

@ -391,7 +391,8 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc
// 根据薪资所属月获取上季度月份
LocalDateRange lastQuarterRange = SalaryDateUtil.getLastQuarterRange(salaryAcctRecordPO.getSalaryMonth());
// 获取义务人下所有账套
List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId());
// List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId());
List<SalarySobPO> salarySobPOS = getSalarySobService(user).listAll();
Set<Long> salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId);
List<SalaryAcctRecordPO> salaryAcctRecordPOS = getSalaryAcctRecordService(user).listBySalarySobIdsAndSalaryMonth(salarySobIds, lastQuarterRange);
// 过滤未归档的核算记录
@ -434,7 +435,9 @@ public class SalaryAcctCalculateServiceImpl extends Service implements SalaryAcc
}
});
// 获取义务人下所有账套
List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId());
// List<SalarySobPO> salarySobPOS = getSalarySobService(user).listByTaxAgentId(salarySob.getTaxAgentId());
// 取所有账套
List<SalarySobPO> salarySobPOS = getSalarySobService(user).listAll();
Set<Long> salarySobIds = SalaryEntityUtil.properties(salarySobPOS, SalarySobPO::getId);
// 3个时间范围
LocalDate salaryMonthLocalDate = SalaryDateUtil.dateToLocalDate(salaryAcctRecordPO.getSalaryMonth());