From 81ccb6c1e23431f3d4bfd76cbd1db1d0a575e499 Mon Sep 17 00:00:00 2001
From: Harryxzy <xuzhuoyan_xzy@163.com>
Date: Wed, 5 Feb 2025 17:27:30 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=86=E6=82=A6=20=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E5=8D=95=E7=BA=BF=E7=A8=8B=E6=A0=B8=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../salaryacct/SalaryAcctManager.java         | 20 +++++++++----------
 .../impl/SalaryAcctResultServiceImpl.java     | 18 ++++++++---------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
index 289b898bd..652fda273 100644
--- a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
+++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
@@ -4,9 +4,9 @@ import com.engine.common.util.ServiceUtil;
 import com.engine.core.impl.Service;
 import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
+import com.engine.salary.entity.progress.ProgressDTO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculateBO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculatePriorityBO;
-import com.engine.salary.entity.progress.ProgressDTO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
@@ -30,9 +30,6 @@ import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
-import com.weaver.util.threadPool.ThreadPoolUtil;
-import com.weaver.util.threadPool.constant.ModulePoolEnum;
-import com.weaver.util.threadPool.entity.LocalRunnable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -327,13 +324,14 @@ public class SalaryAcctManager extends Service {
                         .setCalculateKey(calculateKey)
                         .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);
+                // LocalRunnable localRunnable = new LocalRunnable() {
+                //     @Override
+                //     public void execute() {
+                //         getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                //     }
+                // };
+                // ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
+                getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
             }
             // 13、等待所有子线程执行完毕
             childMonitor.await();
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index d2784f8cb..91940f9ef 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -55,9 +55,6 @@ import com.engine.salary.util.page.SalaryPageUtil;
 import com.engine.salary.util.valid.ValidUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
-import com.weaver.util.threadPool.ThreadPoolUtil;
-import com.weaver.util.threadPool.constant.ModulePoolEnum;
-import com.weaver.util.threadPool.entity.LocalRunnable;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.collections4.MapUtils;
@@ -882,13 +879,14 @@ 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);
+                // LocalRunnable localRunnable = new LocalRunnable() {
+                //     @Override
+                //     public void execute() {
+                //         getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                //     }
+                // };
+                // ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
+                getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
             }
             // 13、等待所有子线程执行完毕
             childMonitor.await();