Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01

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,6 +888,9 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                         .setVariableItems(variableItemPOS)
                         .setTaxDeclarationFunction(taxDeclarationFunction);
                 List<SalarySobBackItemPO> finalSalarySobBackItems = salarySobBackItems;
+                if (isSync) {
+                    getSalaryAcctCalculateService(user).calculate(salaryAcctCalculateBO, simpleEmployee, finalSalarySobBackItems);
+                } else {
                     LocalRunnable localRunnable = new LocalRunnable() {
                         @Override
                         public void execute() {
@@ -892,6 +899,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                     };
                     ThreadPoolUtil.fixedPoolExecute(ModulePoolEnum.HRM, "salaryAcctCalculate", localRunnable);
                 }
+            }
             // 13、等待所有子线程执行完毕
             childMonitor.await();
 

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";
+
     /**
      * 工资单二次验证方式
      */