From fe4b8b1fb3f7437d43c64e703590df777d6c54df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Wed, 19 Mar 2025 17:18:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=B8=E7=AE=97=E6=98=AF=E5=90=A6=E9=87=87?=
 =?UTF-8?q?=E7=94=A8=E7=BA=BF=E7=A8=8B=E6=B1=A0=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctResultServiceImpl.java     | 22 +++++++++++++------
 .../sys/constant/SalarySysConstant.java       |  5 +++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 75c1f0fc5..7d6330b10 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -76,6 +76,8 @@ import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.LinkedBlockingDeque;
 import java.util.stream.Collectors;
 
+import static com.engine.salary.sys.constant.SalarySysConstant.SALARY_ACCT_SYNC_TYPE;
+
 /**
  * 薪资核算结果
  * <p>Copyright: Copyright (c) 2022</p>
@@ -863,6 +865,8 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
             // 12.4、是否采用系统算税
             TaxDeclarationFunctionEnum taxDeclarationFunction = getSalarySysConfService(user).getTaxDeclaration();
             // 12.5、多线程运算，运算结果存放在临时表中
+            //是否同步计算
+            boolean isSync = "1".equals(getSalarySysConfService(user).getValueByCode(SALARY_ACCT_SYNC_TYPE));
             for (List<SalaryAcctEmployeePO> acctEmployeePOS : partition) {
                 SalaryAcctCalculateBO salaryAcctCalculateBO = new SalaryAcctCalculateBO()
                         .setSalaryAcctRecordPO(salaryAcctRecordPO)
@@ -884,13 +888,17 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                         .setVariableItems(variableItemPOS)
                         .setTaxDeclarationFunction(taxDeclarationFunction);
                 List<SalarySobBackItemPO> finalSalarySobBackItems = salarySobBackItems;
-                LocalRunnable localRunnable = new LocalRunnable() {
-                    @Override
-                    public void execute() {
-                        getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
-                    }
-                };
-                ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
+                if (isSync) {
+                    getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                } else {
+                    LocalRunnable localRunnable = new LocalRunnable() {
+                        @Override
+                        public void execute() {
+                            getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                        }
+                    };
+                    ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
+                }
             }
             // 13、等待所有子线程执行完毕
             childMonitor.await();
diff --git a/src/com/engine/salary/sys/constant/SalarySysConstant.java b/src/com/engine/salary/sys/constant/SalarySysConstant.java
index 9013c9126..ebca19807 100644
--- a/src/com/engine/salary/sys/constant/SalarySysConstant.java
+++ b/src/com/engine/salary/sys/constant/SalarySysConstant.java
@@ -71,6 +71,11 @@ public class SalarySysConstant {
      */
     public static final String SALARY_ACCT_EMPLOYEE_RULE = "salaryAcctEmployeeRule";
 
+    /**
+     * 是否采用线程池，同步异步。空/0异步， 1同步
+     */
+    public static final String SALARY_ACCT_SYNC_TYPE = "SALARY_ACCT_SYNC_TYPE";
+
     /**
      * 工资单二次验证方式
      */