diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index ba977a693..ce06f3244 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -50,10 +50,6 @@ public class SalaryAcctRecordBO { List salarySendCheckResult, Map workflowStatusMap, List taxAgentPOS) { - List taxAgentPOS, - List needApprovalSalarySobIds, - boolean approvalCanFile, - boolean approvalCanReCalc) { if (CollectionUtils.isEmpty(salaryAcctRecordPOS)) { return Collections.emptyList(); } diff --git a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java index 4c007e5ce..6eadf9136 100644 --- a/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java +++ b/src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java @@ -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 operate;