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

Merge branch 'release/3.0.2.2504.01' into release/个税&业务线

This commit is contained in:
钱涛 2026-03-23 15:52:35 +08:00
parent d3c0dbe7d7 7b4ab93f4b
commit 809fcbeebb
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/mapper/salarybill/SalarySendInfoMapper.xml
View File

@ -632,7 +632,7 @@
<if test="param.startSalaryMonth != null"> <if test="param.startSalaryMonth != null">
AND t1.salary_month >= #{param.startSalaryMonth} AND t1.salary_month >= #{param.startSalaryMonth}
</if> </if>
ORDER BY t1.id DESC ORDER BY t1.salary_month DESC
</select> </select>

2
src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
View File

@ -1439,7 +1439,7 @@ public class SalaryAcctExcelServiceImpl extends Service implements SalaryAcctExc
loggerContext.setOperateType(OperateTypeEnum.EXCEL_IMPORT.getValue()); loggerContext.setOperateType(OperateTypeEnum.EXCEL_IMPORT.getValue());
loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入薪资核算数据")); loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "导入薪资核算数据"));
loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入薪资核算数据 ") + targetName); loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "导入薪资核算数据 ") + targetName);
loggerContext.setOldValueList(list4log); loggerContext.setNewValueList(list4log);
SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext); SalaryElogConfig.salaryAcctRecordLoggerTemplate.write(loggerContext);
// //报表 // //报表

10
src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
View File

@ -810,9 +810,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98819, "薪资核算结果还未归档，可直接核算")); throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(98819, "薪资核算结果还未归档，可直接核算"));
} }
// 税款所在年的日期范围（第一天～最后一天） // 税款所在年的日期范围（第一天～最后一天）
LocalDateRange yearRange = SalaryDateUtil.localDate2YearRange(salaryAcctRecordPO.getSalaryMonth()); LocalDateRange yearRange = SalaryDateUtil.localDate2YearRange(salaryAcctRecordPO.getTaxCycle());
if (Objects.isNull(yearRange)) { if (Objects.isNull(yearRange)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "薪资所属月为空")); throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(84026, "税款所属期为空"));
} }
// 查询税款所在年的该个税扣缴义务人所有薪资核算记录 // 查询税款所在年的该个税扣缴义务人所有薪资核算记录
// 获取账套所属个税扣缴义务人的核算记录 // 获取账套所属个税扣缴义务人的核算记录
@ -829,13 +829,13 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
if (!taxDeclarationFunctionEnum.getValue().equals(TaxDeclarationFunctionEnum.CLOSURE.getValue())) { if (!taxDeclarationFunctionEnum.getValue().equals(TaxDeclarationFunctionEnum.CLOSURE.getValue())) {
// 如果已经存在之后月份的薪资核算记录了，就不允许重新核算本月了 // 如果已经存在之后月份的薪资核算记录了，就不允许重新核算本月了
SalaryAcctRecordPO afterSalaryAcctRecordPO = selfSalaryAcctRecordPOS.stream() SalaryAcctRecordPO afterSalaryAcctRecordPO = selfSalaryAcctRecordPOS.stream()
.filter(po -> po.getSalaryMonth().compareTo(salaryAcctRecordPO.getSalaryMonth()) > 0) .filter(po -> po.getTaxCycle().compareTo(salaryAcctRecordPO.getTaxCycle()) > 0)
.findAny() .findAny()
.orElse(null); .orElse(null);
if (Objects.nonNull(afterSalaryAcctRecordPO)) { if (Objects.nonNull(afterSalaryAcctRecordPO)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(105826, "已经存在{0}的薪资核算记录了，不能重新核算{1}的薪资了") throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(105826, "已经存在{0}的薪资核算记录了，不能重新核算{1}的薪资了")
.replace("{0}", SalaryDateUtil.localDate2YearMonth(afterSalaryAcctRecordPO.getSalaryMonth()).toString()) .replace("{0}", SalaryDateUtil.localDate2YearMonth(afterSalaryAcctRecordPO.getTaxCycle()).toString())
.replace("{1}", SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getSalaryMonth()).toString())); .replace("{1}", SalaryDateUtil.localDate2YearMonth(salaryAcctRecordPO.getTaxCycle()).toString()));
} }
} }