From 709d9dd97498140af0e9ac91634d61fb7d45ccb4 Mon Sep 17 00:00:00 2001
From: lys <971387674@qq.com>
Date: Mon, 9 Dec 2024 17:40:25 +0800
Subject: [PATCH] =?UTF-8?q?custom/=E9=87=91=E5=8D=8E=E4=BA=A4=E6=8A=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pc4mobx/hrmSalary/apis/calculate.js                           | 4 ++--
 .../pages/socialSecurityBenefits/standingBook/standingBook.js | 2 +-
 .../standingBookDetail/components/normal.js                   | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pc4mobx/hrmSalary/apis/calculate.js b/pc4mobx/hrmSalary/apis/calculate.js
index 8e4a2d5e..fbc8abb9 100644
--- a/pc4mobx/hrmSalary/apis/calculate.js
+++ b/pc4mobx/hrmSalary/apis/calculate.js
@@ -218,8 +218,8 @@ export const exportComparisonResult = (salaryAcctRecordId) => {
 };
 
 // 核算进度条
-export const getCalculateProgress = (id) => {
-  return WeaTools.callApi("/api/bs/hrmsalary/progress/getRate?cacheKey=ACCT_PROGRESS_" + id, "get", {});
+export const getCalculateProgress = (id = "", paymentOrganization = "") => {
+  return WeaTools.callApi(`/api/bs/hrmsalary/progress/getRate?cacheKey=ACCT_PROGRESS_${id}_${paymentOrganization}`, "get", {});
 };
 
 // 核算进度条
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
index 80083d56..2f5cda63 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
@@ -60,7 +60,7 @@ class StandingBook extends Component {
         progressVisible: true
       }, () => {
         this.timer = setInterval(() => {
-          getCalculateProgress(moment(billMonth).format("YYYY-MM")).then(({ status, data }) => {
+          getCalculateProgress(moment(billMonth).format("YYYY-MM"), payload.paymentOrganization).then(({ status, data }) => {
             if (status) {
               if (!data.status) {
                 clearInterval(this.timer);
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index d7366471..aa2ea15d 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -359,7 +359,7 @@ export default class NormalIndex extends Component {
       progressVisible: true
     }, () => {
       this.timer = setInterval(() => {
-        getCalculateProgress(billMonth).then(({ status, data }) => {
+        getCalculateProgress(billMonth, paymentOrganization).then(({ status, data }) => {
           if (status) {
             if (!data.status) {
               clearInterval(this.timer);