From dc3dfc2d6bb51affc05bfe98c69aa3f94622a374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Fri, 20 Sep 2024 11:41:44 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E8=84=B1=E6=95=8F=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/salaryacct/param/SalaryAcctCalculateParam.java  | 7 -------
 .../salary/service/impl/SalaryAcctResultServiceImpl.java   | 7 -------
 src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java | 5 -----
 3 files changed, 19 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java
index b09c535ce..52c3b7f13 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctCalculateParam.java
@@ -1,6 +1,5 @@
 package com.engine.salary.entity.salaryacct.param;
 
-import com.engine.salary.entity.datacollection.DataCollectionEmployee;
 import com.engine.salary.util.valid.DataCheck;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -8,7 +7,6 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.util.Collection;
-import java.util.Map;
 
 /**
  * 薪资核算的参数
@@ -29,9 +27,4 @@ public class SalaryAcctCalculateParam {
 
     @DataCheck(require = true,message = "参数错误，薪资核算记录ID不能为空")
     private Long salaryAcctRecordId;
-
-    /**
-     * 人员信息，报表使用
-     */
-    private Map<Long, DataCollectionEmployee>  emps;
 }
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index 8019268ee..61320e5e3 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -976,13 +976,6 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
         List<SalaryAcctResultPO> salaryAcctResultPOS = SalaryAcctResultBO.convert2ResultPO(salaryAcctResultTempPOS);
         batchSave(salaryAcctResultPOS);
         sw.stop();
-        new Thread() {
-            public void run() {
-                //保存核算报表数据
-                List<SalaryAcctResultReportPO> salaryAcctResultReportPOS = SalaryAcctResultReportBO.convert2ReportPO(salaryAcctResultTempPOS, calculateParam.getEmps());
-                getSalaryAcctReportService(user).batchSave(salaryAcctResultReportPOS);
-            }
-        }.start();
         // 删除薪资核算临时存储表中的数据
         sw.start("处理核算数据，删除薪资核算临时存储表中的数据");
         getSalaryAcctResultTempService(user).deleteByCalculateKey(calculateKey);
diff --git a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
index b53499bf5..094602f01 100644
--- a/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java
@@ -16,7 +16,6 @@ import com.engine.salary.service.*;
 import com.engine.salary.service.impl.*;
 import com.engine.salary.sys.service.SalarySysConfService;
 import com.engine.salary.sys.service.impl.SalarySysConfServiceImpl;
-import com.engine.salary.util.SalaryEntityUtil;
 import com.engine.salary.util.SalaryI18nUtil;
 import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.valid.ValidUtil;
@@ -207,10 +206,6 @@ public class SalaryAcctResultWrapper extends Service implements SalaryAcctResult
     public void calculate(SalaryAcctCalculateParam calculateParam) {
         log.info("开始核算V1{}", calculateParam);
 
-        //报表参数
-        List<DataCollectionEmployee> emps = getSalaryEmployeeService(user).listAllForReport();
-        calculateParam.setEmps(SalaryEntityUtil.convert2Map(emps, DataCollectionEmployee::getEmployeeId));
-
         //当前登陆人员
         DataCollectionEmployee simpleEmployee = new DataCollectionEmployee();
         simpleEmployee.setEmployeeId((long) user.getUID());