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

百川二开

This commit is contained in:
钱涛 2026-03-30 10:42:05 +08:00
parent 6795b4a71a
commit d6d8052645
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
View File

@ -82,7 +82,7 @@ public class SalaryAcctRecordBO {
if (zy) {
btnList.add(new WeaTableOperate("查看", null, "3"));
}
if(jl){
if (jl) {
btnList.add(new WeaTableOperate("核算", null, "0"));
if (approvalCanFile || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) {
btnList.add(new WeaTableOperate("归档", null, "2"));
@ -91,17 +91,21 @@ public class SalaryAcctRecordBO {
} else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && (salarySendMap.get(salaryAcctRecordPO.getId()) == Boolean.TRUE)) {
btnList.add(new WeaTableOperate("查看", null, "3"));
if (approvalCanReCalc || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) {
if (jl) {
btnList.add(new WeaTableOperate("重新核算", null, "4"));
}
}
// if (salaryAcctRecordPO.getBackCalcStatus() == null || salaryAcctRecordPO.getBackCalcStatus() == NumberUtils.INTEGER_ZERO) {
// btnList.add(new WeaTableOperate("回算", null, "5"));
// }
} else {
btnList.add(new WeaTableOperate("查看", null, "3"));
if (approvalCanReCalc || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) {
if (jl) {
btnList.add(new WeaTableOperate("重新核算", null, "4"));
}
}
}
String taxAgentName = salarySobPO.getTaxAgentIds().stream().map(id -> taxAgentMap.getOrDefault(id, "")).collect(Collectors.joining(","));
return SalaryAcctRecordListDTO.builder()
.id(salaryAcctRecordPO.getId())

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

@ -792,9 +792,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
// 删除个税申报表及往期累计情况
getTaxDeclarationService(user).delete(salaryAcctRecordPO);
}
//百川二开，重新核算：已归档-》待审批
// 更新薪资核算记录的状态
salaryAcctRecordPO.setStatus(SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue());
salaryAcctRecordPO.setStatus(SalaryAcctRecordStatusEnum.APPROVAL.getValue());
salaryAcctRecordPO.setUpdateTime(new Date());
getSalaryAcctRecordMapper().updateIgnoreNull(salaryAcctRecordPO);