From 89734ae02299a7cc2daf64b32518aeeb8b07b2ac Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 1 Sep 2023 11:19:56 +0800 Subject: [PATCH] =?UTF-8?q?=E6=98=82=E7=AB=8B=EF=BC=8C=E5=B7=A5=E8=B5=84?= =?UTF-8?q?=E5=8D=95=E5=AE=A1=E6=89=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salaryacct/param/SalaryAcctApprovalWorkflowParam.java | 2 +- .../salary/mapper/salaryacct/SalaryAcctRecordMapper.xml | 3 +++ .../salary/service/impl/SalaryAcctRecordServiceImpl.java | 8 ++++++-- .../engine/salary/wrapper/SalaryAcctRecordWrapper.java | 1 + 4 files changed, 11 insertions(+), 3 deletions(-) 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