From 336aaeabea3274ca67f11ed28f19feaf8e19d180 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 30 Jan 2024 15:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E6=9C=AC=E7=BB=B4=E5=BA=A6=EF=BC=8C?=
 =?UTF-8?q?=E6=97=A0=E5=88=86=E7=BB=84=E6=8E=92=E5=BA=8F=E6=94=BE=E5=88=B0?=
 =?UTF-8?q?=E6=9C=AB=E5=B0=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SalaryStatisticsReportServiceImpl.java    |  6 +++---
 .../wrapper/SalaryStatisticsReportWrapper.java     | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index 5819ce821..261e6292b 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -31,13 +31,13 @@ import com.engine.salary.report.util.ReportTimeUtil;
 import com.engine.salary.service.*;
 import com.engine.salary.service.impl.*;
 import com.engine.salary.util.*;
+import com.engine.salary.util.db.IdGenerator;
 import com.engine.salary.util.db.MapperProxyFactory;
 import com.engine.salary.util.page.PageInfo;
 import com.engine.salary.util.page.SalaryPageUtil;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
-import com.engine.salary.util.db.IdGenerator;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.math.NumberUtils;
@@ -472,7 +472,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
         Map<Long, List<SalaryAcctResultPO>> salaryAcctEmpResultMap = SalaryEntityUtil.group2Map(salaryAcctResultValues, SalaryAcctResultPO::getSalaryAcctEmpId);
         Map<Long, Map<String, String>> map = new HashMap<>();
         salaryAcctEmpResultMap.forEach((k, v) -> {
-            Map<String, String> collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2o(p.getResultValue()), (key1, key2) -> key2));
+            Map<String, String> collect = v.stream().collect(Collectors.toMap(p -> Util.null2String(p.getSalaryItemId()), p -> Util.null2String(p.getResultValue()), (key1, key2) -> key2));
             map.put(k, collect);
         });
 
@@ -1937,7 +1937,7 @@ public class SalaryStatisticsReportServiceImpl extends Service implements Salary
         Map<Long, String> sameEmpIdYearMap = new HashMap<>();
 
         String dimensionValue = data.getDimensionValue();
-        dimensionSet.forEach(k -> {
+        dimensionSet.stream().sorted((a,b)->b.length()-a.length()).forEach(k -> {
             if (dimensionValue == null) {
                 List<SalaryAcctEmployeePO> salaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getList(), empIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList());
                 List<SalaryAcctEmployeePO> lastSalaryAcctEmployees = SalaryStatisticsReportBO.listAcctEmpByRationGroupIndividual(k, dimension.getDimCode(), data.getLastList(), lastEmpIdYearMap, salaryAcctResultValueMap, data.getSalaryStatisticsItemList());
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 0da317ee9..508877028 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -319,13 +319,13 @@ public class SalaryStatisticsReportWrapper extends Service {
         //已缓存的报表id
         String salaryReportIds = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_IDS));
         String salaryReportConditions = "";
-//        if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
-//            //报表中缓存的条件
-//            salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
-//            if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
-//                return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
-//            }
-//        }
+        if (StringUtils.isNotBlank(salaryReportIds) && salaryReportIds.contains(id + "")) {
+            //报表中缓存的条件
+            salaryReportConditions = Utils.null2String(getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_CONDITIONS + id));
+            if (StringUtils.isNotBlank(salaryReportConditions) && salaryReportConditions.contains(paramMd5)) {
+                return getSalaryCacheService(user).get(SalaryCacheKey.SALARY_REPORT_DATA + id + "_" + paramMd5);
+            }
+        }
 
 
         // 列表data