From d6d8052645833ac952a1e66ed82bd6291c9e51f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 30 Mar 2026 10:42:05 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BE=E5=B7=9D=E4=BA=8C=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/salaryacct/bo/SalaryAcctRecordBO.java       | 10 +++++++---
 .../service/impl/SalaryAcctRecordServiceImpl.java      |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
index 5a27794dd..d7140f42c 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
@@ -82,7 +82,7 @@ public class SalaryAcctRecordBO {
                         if (zy) {
                             btnList.add(new WeaTableOperate("查看", null, "3"));
                         }
-                        if(jl){
+                        if (jl) {
                             btnList.add(new WeaTableOperate("核算", null, "0"));
                             if (approvalCanFile || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) {
                                 btnList.add(new WeaTableOperate("归档", null, "2"));
@@ -91,7 +91,9 @@ public class SalaryAcctRecordBO {
                     } else if (SalaryAcctRecordStatusEnum.ARCHIVED == salaryAcctRecordStatusEnum && (salarySendMap.get(salaryAcctRecordPO.getId()) == Boolean.TRUE)) {
                         btnList.add(new WeaTableOperate("查看", null, "3"));
                         if (approvalCanReCalc || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) {
-                            btnList.add(new WeaTableOperate("重新核算", null, "4"));
+                            if (jl) {
+                                btnList.add(new WeaTableOperate("重新核算", null, "4"));
+                            }
                         }
 //                        if (salaryAcctRecordPO.getBackCalcStatus() == null || salaryAcctRecordPO.getBackCalcStatus() == NumberUtils.INTEGER_ZERO) {
 //                            btnList.add(new WeaTableOperate("回算", null, "5"));
@@ -99,7 +101,9 @@ public class SalaryAcctRecordBO {
                     } else {
                         btnList.add(new WeaTableOperate("查看", null, "3"));
                         if (approvalCanReCalc || !needApprovalSalarySobIds.contains(salaryAcctRecordPO.getSalarySobId())) {
-                            btnList.add(new WeaTableOperate("重新核算", null, "4"));
+                            if (jl) {
+                                btnList.add(new WeaTableOperate("重新核算", null, "4"));
+                            }
                         }
                     }
                     String taxAgentName = salarySobPO.getTaxAgentIds().stream().map(id -> taxAgentMap.getOrDefault(id, "")).collect(Collectors.joining(","));
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index d2837206b..f7a4c3353 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -792,9 +792,9 @@ public class SalaryAcctRecordServiceImpl extends Service implements SalaryAcctRe
             // 删除个税申报表及往期累计情况
             getTaxDeclarationService(user).delete(salaryAcctRecordPO);
         }
-
+        //百川二开，重新核算：已归档-》待审批
         // 更新薪资核算记录的状态
-        salaryAcctRecordPO.setStatus(SalaryAcctRecordStatusEnum.NOT_ARCHIVED.getValue());
+        salaryAcctRecordPO.setStatus(SalaryAcctRecordStatusEnum.APPROVAL.getValue());
         salaryAcctRecordPO.setUpdateTime(new Date());
         getSalaryAcctRecordMapper().updateIgnoreNull(salaryAcctRecordPO);