From 37f60c287558c08fab34aee7c4ce9db099360547 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=8E=E6=B0=B8=E9=A1=BA?= <971387674@qq.com>
Date: Thu, 6 Apr 2023 13:30:23 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A4=BE=E4=BF=9D=E7=A6=8F=E5=88=A9=E5=8F=B0?=
 =?UTF-8?q?=E8=B4=A6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=9B=BF=E6=8D=A2?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=EF=BC=8C=E6=B7=BB=E5=8A=A0=E5=90=88=E8=AE=A1?=
 =?UTF-8?q?=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../standingBookDetail/components/normal.js   |  6 +++--
 .../standingBookDetail/components/regList.js  | 22 ++++++++++++++-----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
index 8efddabf..e10d3591 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/normal.js
@@ -115,12 +115,14 @@ export default class NormalIndex extends Component {
     return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" });
   };
   siaccountDetailCommonListSum = () => {
+    const { searchValue: userName } = this.state;
     const { billMonth, paymentOrganization } = this.props;
-    return siaccountDetailCommonListSum({ billMonth, paymentOrganization });
+    return siaccountDetailCommonListSum({ billMonth, paymentOrganization, userName });
   };
   siaccountDetailSupplementaryListSum = () => {
+    const { searchValue: userName } = this.state;
     const { billMonth, paymentOrganization } = this.props;
-    return siaccountDetailSupplementaryListSum({ billMonth, paymentOrganization });
+    return siaccountDetailSupplementaryListSum({ billMonth, paymentOrganization, userName });
   };
 
   componentWillUnmount() {
diff --git a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
index 3c24e94e..477de105 100644
--- a/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
+++ b/pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBookDetail/components/regList.js
@@ -79,15 +79,19 @@ class RegList extends Component {
   sysConfCodeRule = () => {
     return sysConfCodeRule({ code: "OPEN_ACCT_RESULT_SUM" });
   };
-  siaccountDetailRecessionListSum = () => {
+  siaccountDetailRecessionListSum = (module = {}) => {
+    const paymentStatus = "3";
+    const creator = Number(getQueryString("creator"));
     const billMonth = getQueryString("billMonth");
     const paymentOrganization = getQueryString("paymentOrganization");
-    return siaccountDetailRecessionListSum({ billMonth, paymentOrganization });
+    return siaccountDetailRecessionListSum({ creator, paymentStatus, billMonth, paymentOrganization, ...module });
   };
-  siaccountDetailBalanceListSum = () => {
+  siaccountDetailBalanceListSum = (module = {}) => {
+    const paymentStatus = "3";
+    const creator = Number(getQueryString("creator"));
     const billMonth = getQueryString("billMonth");
     const paymentOrganization = getQueryString("paymentOrganization");
-    return siaccountDetailBalanceListSum({ billMonth, paymentOrganization });
+    return siaccountDetailBalanceListSum({ creator, paymentStatus, billMonth, paymentOrganization, ...module });
   };
 
   componentWillReceiveProps(nextProps, nextContext) {
@@ -103,8 +107,12 @@ class RegList extends Component {
   handleResetSelectRowKeys = (selectedRowKeys) => {
     this.setState({ selectedRowKeys });
   };
-  recessionList = (module) => {
+  recessionList = async (module) => {
     const { type } = this.props;
+    const { status: sysStatus, data: sysData } = await this.sysConfCodeRule();
+    const { data: { sumRow: siaccountSum } } = type === "regression" ?
+      await this.siaccountDetailRecessionListSum({ ...module }) :
+      await this.siaccountDetailBalanceListSum({ ...module });
     const { loading, pageInfo } = this.state;
     const billMonth = getQueryString("billMonth");
     const paymentOrganization = getQueryString("paymentOrganization");
@@ -125,7 +133,9 @@ class RegList extends Component {
         this.setState({
           pageInfo: { ...pageInfo, current, pageSize, total },
           dataSource,
-          columns
+          columns,
+          showSum: sysStatus && sysData === "1",
+          siaccountSum
         }, () => this.postMessageToChild());
       }
     }).catch(() => {