From e49bc9943fc5b477114e52a51006cd9dfade7462 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 12 May 2022 15:41:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E6=A0=B8=E7=AE=97=E7=AC=AC?=
 =?UTF-8?q?=E4=B8=80=E6=AD=A5=E4=B8=8D=E4=BD=BF=E7=94=A8=E7=BA=BF=E7=A8=8B?=
 =?UTF-8?q?=E6=B1=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryAcctResultServiceImpl.java     |  2 +-
 .../wrapper/SalaryAcctResultWrapper.java      | 31 +++++++++++--------
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 48b53007f..38245a7e5 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -465,7 +465,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                         getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee);
                     }
                 };
-                ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.OTHER, "salaryAcctCalculateV2", localRunnable);
+                ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculateV2", localRunnable);
             }
             // 13、等待所有子线程执行完毕
             childMonitor.await();
diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
index 57bb1ffd8..861c69a78 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
@@ -40,7 +40,7 @@ public class SalaryAcctResultWrapper extends Service {
     private SalaryAcctResultService getSalaryAcctResultService(User user) {
         return (SalaryAcctResultService) ServiceUtil.getService(SalaryAcctResultServiceImpl.class, user);
     }
-    
+
     private SalaryAcctRecordService getSalaryAcctRecordService(User user) {
         return (SalaryAcctRecordService) ServiceUtil.getService(SalaryAcctRecordServiceImpl.class, user);
     }
@@ -48,7 +48,7 @@ public class SalaryAcctResultWrapper extends Service {
     private SalarySobItemService getSalarySobItemService(User user) {
         return (SalarySobItemService) ServiceUtil.getService(SalarySobItemServiceImpl.class, user);
     }
-    
+
     private SalaryAcctEmployeeWrapper getSalaryAcctEmployeeWrapper(User user) {
         return (SalaryAcctEmployeeWrapper) ServiceUtil.getService(SalaryAcctEmployeeWrapper.class, user);
     }
@@ -56,9 +56,9 @@ public class SalaryAcctResultWrapper extends Service {
     private SalaryAcctProgressService getSalaryAcctProgressService(User user) {
         return (SalaryAcctProgressService) ServiceUtil.getService(SalaryAcctProgressServiceImpl.class, user);
     }
-    
+
 //    private SalaryCheckResultService salaryCheckResultService;
-    
+
     private TaxAgentService getTaxAgentService(User user) {
         return (TaxAgentService) ServiceUtil.getService(TaxAgentServiceImpl.class, user);
     }
@@ -73,7 +73,7 @@ public class SalaryAcctResultWrapper extends Service {
      * @param queryParam 列表查询条件
      * @return
      */
-    public Map<String,Object> listPage(SalaryAcctResultQueryParam queryParam) {
+    public Map<String, Object> listPage(SalaryAcctResultQueryParam queryParam) {
         ValidUtil.doValidator(queryParam);
         // 查询薪资核算记录
         SalaryAcctRecordPO salaryAcctRecordPO = getSalaryAcctRecordService(user).getById(queryParam.getSalaryAcctRecordId());
@@ -87,15 +87,14 @@ public class SalaryAcctResultWrapper extends Service {
         // 构建薪资核算结果列表的表头
         List<WeaTableColumnGroup> columns = getSalaryAcctExcelService(user).listWeaTableColumn(salaryAcctRecordPO);
 
-        Map<String,Object> datas = new HashMap<>();
+        Map<String, Object> datas = new HashMap<>();
         datas.put("pageInfo", page);
-        datas.put("columns",columns);
+        datas.put("columns", columns);
 
         return datas;
     }
 
 
-
     /**
      * 获取薪资核算列表的高级搜索
      *
@@ -146,7 +145,7 @@ public class SalaryAcctResultWrapper extends Service {
     /**
      * 保存薪资核算结果
      *
-     * @param saveParam  保存参数
+     * @param saveParam 保存参数
      */
     public void save(SalaryAcctResultSaveParam saveParam) {
         getSalaryAcctResultService(user).save(saveParam);
@@ -158,10 +157,10 @@ public class SalaryAcctResultWrapper extends Service {
      * @param calculateParam 薪资核算的参数
      */
     public void calculate(SalaryAcctCalculateParam calculateParam) {
-        log.info("开始核算V1{}",calculateParam);
+        log.info("开始核算V1{}", calculateParam);
         //当前登陆人员
         DataCollectionEmployee simpleEmployee = new DataCollectionEmployee();
-        simpleEmployee.setEmployeeId((long)user.getUID());
+        simpleEmployee.setEmployeeId((long) user.getUID());
         // 检查薪资核算人员的个税扣缴义务人
         getSalaryAcctEmployeeWrapper(user).checkTaxAgent(calculateParam.getSalaryAcctRecordId());
         // 检查是否正在核算中
@@ -183,10 +182,16 @@ public class SalaryAcctResultWrapper extends Service {
 //        LocalRunnable localRunnable = new LocalRunnable() {
 //            @Override
 //            public void execute() {
-                getSalaryAcctResultService(user).calculate(calculateParam, simpleEmployee);
+//                getSalaryAcctResultService(user).calculate(calculateParam, simpleEmployee);
 //            }
 //        };
-//        ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.OTHER, "salaryAcctCalculateV1", localRunnable);
+//        ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculateV1", localRunnable);
+        new Thread() {
+            public void run() {
+                getSalaryAcctResultService(user).calculate(calculateParam, simpleEmployee);
+            }
+        }.start();
+
     }
 
     /**