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

处理冲突

This commit is contained in:
钱涛 2025-10-21 18:07:52 +08:00
parent 5439659ce3
commit dbb571785c
2 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,10 +50,6 @@ public class SalaryAcctRecordBO {
List<SalarySendCheckDTO> salarySendCheckResult,
Map<String, String> workflowStatusMap,
List<TaxAgentPO> taxAgentPOS) {
List<TaxAgentPO> taxAgentPOS,
List<Long> needApprovalSalarySobIds,
boolean approvalCanFile,
boolean approvalCanReCalc) {
if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) {
return Collections.emptyList();
}

2
src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java
View File

@ -78,7 +78,7 @@ public class SalaryAcctRecordListDTO {
private String workflowUrl;
// @TableTitle(title = "审批状态", dataIndex = "approvalStatus", key = "approvalStatus")
// private String approvalStatus;
private String approvalStatus;
@TableTitle(title = "操作", dataIndex = "operate", key = "operate")
private List<WeaTableOperate> operate;