From bfbd9e4b4057cbebbefd1ce286ec8de3d8da9bd6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 28 Oct 2024 11:35:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=BA=E5=91=98=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../param/SalaryAcctEmployeeQueryParam.java   |  7 +++
 .../salaryacct/SalaryAcctEmployeeMapper.xml   | 54 +++++++++++++++++++
 .../SalaryStatisticsReportServiceImpl.java    |  6 +--
 .../impl/SalaryAcctEmployeeServiceImpl.java   | 16 +++---
 4 files changed, 73 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
index 977f1572e..f0437b8d0 100644
--- a/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
+++ b/src/com/engine/salary/entity/salaryacct/param/SalaryAcctEmployeeQueryParam.java
@@ -64,4 +64,11 @@ public class SalaryAcctEmployeeQueryParam extends BaseQueryParam {
 
     private List<Long> taxAgentIds;
     private Set<Date> salaryMonths;
+
+
+    private Collection<Long> salaryAcctRecordIds;
+    private Collection<Long> salarySobIds;
+    private Collection<Long> employeeIds;
+
+
 }
diff --git a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
index 6cede4796..352eb7416 100644
--- a/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
+++ b/src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml
@@ -637,6 +637,24 @@
             </if>
             )
         </if>
+        <if test="param.salaryAcctRecordIds != null and param.salaryAcctRecordIds.size()>0">
+            AND t.salary_acct_record_id IN
+            <foreach collection="param.salaryAcctRecordIds" open="(" item="salaryAcctRecordId" separator="," close=")">
+                #{salaryAcctRecordId}
+            </foreach>
+        </if>
+        <if test="param.employeeIds != null and param.employeeIds.size()>0">
+            AND t.employee_id IN
+            <foreach collection="param.employeeIds" open="(" item="employeeId" separator="," close=")">
+                #{employeeId}
+            </foreach>
+        </if>
+        <if test="param.salarySobIds != null and param.salarySobIds.size()>0">
+            AND t.salary_sob_id IN
+            <foreach collection="param.salarySobIds" open="(" item="salarySobId" separator="," close=")">
+                #{salarySobId}
+            </foreach>
+        </if>
     </sql>
     <sql id="SalaryAcctEmployeeParamSql" databaseId="oracle">
         <if test="param.salaryAcctRecordId != null">
@@ -711,6 +729,24 @@
             </if>
             )
         </if>
+        <if test="param.salaryAcctRecordIds != null and param.salaryAcctRecordIds.size()>0">
+            AND t.salary_acct_record_id IN
+            <foreach collection="param.salaryAcctRecordIds" open="(" item="salaryAcctRecordId" separator="," close=")">
+                #{salaryAcctRecordId}
+            </foreach>
+        </if>
+        <if test="param.employeeIds != null and param.employeeIds.size()>0">
+            AND t.employee_id IN
+            <foreach collection="param.employeeIds" open="(" item="employeeId" separator="," close=")">
+                #{employeeId}
+            </foreach>
+        </if>
+        <if test="param.salarySobIds != null and param.salarySobIds.size()>0">
+            AND t.salary_sob_id IN
+            <foreach collection="param.salarySobIds" open="(" item="salarySobId" separator="," close=")">
+                #{salarySobId}
+            </foreach>
+        </if>
     </sql>
     <sql id="SalaryAcctEmployeeParamSql" databaseId="sqlserver">
         <if test="param.salaryAcctRecordId != null">
@@ -786,6 +822,24 @@
             </if>
             )
         </if>
+        <if test="param.salaryAcctRecordIds != null and param.salaryAcctRecordIds.size()>0">
+            AND t.salary_acct_record_id IN
+            <foreach collection="param.salaryAcctRecordIds" open="(" item="salaryAcctRecordId" separator="," close=")">
+                #{salaryAcctRecordId}
+            </foreach>
+        </if>
+        <if test="param.employeeIds != null and param.employeeIds.size()>0">
+            AND t.employee_id IN
+            <foreach collection="param.employeeIds" open="(" item="employeeId" separator="," close=")">
+                #{employeeId}
+            </foreach>
+        </if>
+        <if test="param.salarySobIds != null and param.salarySobIds.size()>0">
+            AND t.salary_sob_id IN
+            <foreach collection="param.salarySobIds" open="(" item="salarySobId" separator="," close=")">
+                #{salarySobId}
+            </foreach>
+        </if>
     </sql>
 
     <select id="listPage4Reduce" resultMap="SalaryAccEmployeeMap">
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index 8886cfa6f..5ee5edea8 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -1192,9 +1192,9 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
 //        List<SalaryAcctEmployeePO> accountDetailPOList = data.getList().stream().filter(po -> pageEmployeeIds.contains(po.getEmployeeId())).collect(Collectors.toList());
         List<Map<String, Object>> records = new ArrayList<>();
         List<SalaryAcctEmployeePO> accountDetailPOList = data.getList();
-        Map<Long, List<SalaryAcctEmployeePO>> employeeListMap = accountDetailPOList.stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId));
-        Map<Long, List<SalaryAcctEmployeePO>> lastEmployeeListMap = data.getLastList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId));
-        Map<Long, List<SalaryAcctEmployeePO>> sameEmployeeListMap = data.getSameList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId));
+        Map<Long, List<SalaryAcctEmployeePO>> employeeListMap = accountDetailPOList.stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId, LinkedHashMap::new, Collectors.toList()));
+        Map<Long, List<SalaryAcctEmployeePO>> lastEmployeeListMap = data.getLastList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId, LinkedHashMap::new, Collectors.toList()));
+        Map<Long, List<SalaryAcctEmployeePO>> sameEmployeeListMap = data.getSameList().stream().collect(Collectors.groupingBy(SalaryAcctEmployeePO::getEmployeeId, LinkedHashMap::new, Collectors.toList()));
 
         List<Long> empIds = accountDetailPOList.stream().map(SalaryAcctEmployeePO::getEmployeeId).distinct().collect(Collectors.toList());
         Map<Long, DataCollectionEmployee> employeeByIdMap = getSalaryEmployeeService(user).getEmployeeByIdsAll(empIds).stream().collect(Collectors.toMap(DataCollectionEmployee::getEmployeeId, o -> o));
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index ee0ddc70a..90391abd4 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -612,7 +612,10 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
 
     @Override
     public List<SalaryAcctEmployeePO> listBySalaryStatisticsReportParam(SalaryStatisticsReportDataQueryParam param) {
-        SalaryAcctEmployeePO lambdaQueryChainWrapper = SalaryAcctEmployeePO.builder().build();
+        //排序配置
+        OrderRuleVO orderRule = getSalarySysConfService(user).orderRule();
+        SalaryAcctEmployeeQueryParam lambdaQueryChainWrapper = new SalaryAcctEmployeeQueryParam();
+        lambdaQueryChainWrapper.setOrderRule(orderRule);
 
         // 个税扣缴义务人
 //        Collection<TaxAgentPO> taxAgentList = getTaxAgentService(user).listAllTaxAgents((long) user.getUID());
@@ -681,12 +684,11 @@ public class SalaryAcctEmployeeServiceImpl extends Service implements SalaryAcct
         if (CollectionUtils.isNotEmpty(salaryAcctRecordIds)) {
             //分片查询
             List<List<Long>> partition = Lists.partition(salaryAcctRecordIds, 500);
-            List<SalaryAcctEmployeePO> empList = new ArrayList<>();
-            partition.forEach(part -> {
-                lambdaQueryChainWrapper.setSalaryAcctRecordIds(salaryAcctRecordIds);
-                empList.addAll(getSalaryAcctEmployeeMapper().listSome(lambdaQueryChainWrapper));
-            });
-            list = empList;
+            for (List<Long> part : partition) {
+                lambdaQueryChainWrapper.setSalaryAcctRecordIds(part);
+                List<SalaryAcctEmployeePO> pos = getSalaryAcctEmployeeMapper().list(lambdaQueryChainWrapper);
+                list.addAll(pos);
+            }
         }
 
         if (CollectionUtils.isEmpty(list)) {