diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctApprovalWorkflowParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctApprovalWorkflowParam.java
index e01df0b6d..16f69bffc 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctApprovalWorkflowParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctApprovalWorkflowParam.java
@@ -20,7 +20,7 @@ public class SalaryAcctApprovalWorkflowParam {
// 薪资核算记录id
@DataCheck(require = true, message = "核算记录id不能为空")
- private Long salaryAcctRecordId;
+ private String salaryAcctRecordId;
// 审批流程requestid
@DataCheck(require = true, message = "requestid不能为空")
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
index 9c0981a10..82d0540c0 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml
@@ -389,6 +389,9 @@
back_calc_status=#{backCalcStatus},
+
+ approval_request_id=#{approvalRequestId},
+
WHERE id = #{id} AND delete_type = 0
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index 21b8b1b58..7e2b39573 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -33,6 +33,7 @@ import com.engine.salary.util.page.PageInfo;
import com.engine.salary.util.page.SalaryPageUtil;
import com.engine.salary.util.valid.ValidUtil;
import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.hrm.User;
@@ -811,8 +812,11 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
@Override
public void setApprovalRequestId(SalaryAcctApprovalWorkflowParam param) {
ValidUtil.doValidator(param);
- SalaryAcctRecordPO po = getSalaryAcctRecordMapper().getById(param.getSalaryAcctRecordId());
- po.setApprovalRequestId(po.getApprovalRequestId());
+ SalaryAcctRecordPO po = getSalaryAcctRecordMapper().getById(Long.valueOf(param.getSalaryAcctRecordId()));
+ if (ObjectUtils.isEmpty(po)) {
+ return;
+ }
+ po.setApprovalRequestId(param.getRequestId());
getSalaryAcctRecordMapper().updateIgnoreNull(po);
}
}
diff --git a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
index be478d4a7..52a22ed4e 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
@@ -96,6 +96,7 @@ public class SalaryAcctRecordWrapper extends Service implements SalaryAcctRecord
List salarySendCheckResult = getSalarySendService(user).getSalarySendCheckResult(salaryAcctRecordIds);
// TODO查询审批流程状态
Set requestIds = SalaryEntityUtil.properties(list, SalaryAcctRecordPO::getApprovalRequestId);
+ requestIds.remove(null);
// 获取流程状态 key:流程请求id value:流程状态
Map workflowStatusMap = getWorkflowStatusMap(requestIds);
// 转换成列表dto