From 85b18d659ec0b224b4e0b0199fa0495b2e428ac9 Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Mon, 11 Dec 2023 13:30:36 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B8=AF=E6=B9=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salaryacct/bo/SalaryAcctRecordBO.java | 2 +- .../salary/mapper/salaryacct/SalaryAcctRecordMapper.java | 2 ++ .../salary/mapper/salaryacct/SalaryAcctRecordMapper.xml | 8 ++++++++ .../salary/service/impl/SalaryAcctRecordServiceImpl.java | 3 +++ 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java index 249a66d17..b8b76a58e 100644 --- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java +++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java @@ -77,7 +77,7 @@ public class SalaryAcctRecordBO { if(!Objects.equals(salaryAcctRecordPO.getBackCalcStatus(),NumberUtils.INTEGER_ONE)){ btnList.add(new WeaTableOperate("删除", null, "1")); } - btnList.add(new WeaTableOperate("归档", null, "2")); + // btnList.add(new WeaTableOperate("归档", null, "2")); } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && ( salarySendMap.get(salaryAcctRecordPO.getId()) ==Boolean.TRUE ) ){ btnList.add(new WeaTableOperate("查看", null, "3")); btnList.add(new WeaTableOperate("重新核算", null, "4")); diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java index 4b560b7c2..7f80e0f84 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.java @@ -78,4 +78,6 @@ public interface SalaryAcctRecordMapper { void updateLockSalaryItemIds(SalaryAcctRecordPO salaryAcctRecord); List getBackCalcRecordByIds(@Param("collection") Set salaryAcctIds); + + void clearApprovalRequestId(@Param("id")Long id); } \ No newline at end of file diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml index 82d0540c0..7a900ad4d 100644 --- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml +++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctRecordMapper.xml @@ -426,4 +426,12 @@ WHERE id = #{id} AND delete_type = 0 + + UPDATE hrsa_salary_acct_record + + approval_request_id = null, + + WHERE id = #{id} + + \ No newline at end of file diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java index 0646c09f5..0b56024e8 100644 --- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java @@ -693,6 +693,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe //删除报表缓存 getSalaryStatisticsReportService(user).removeReportCache(); + + // 删除审批流程id + getSalaryAcctRecordMapper().clearApprovalRequestId(salaryAcctRecordPO.getId()); }