From ce34e86724e9251183ac746fbc400a43740bb6a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Tue, 26 Nov 2024 11:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=B2=E6=AD=A2=E5=86=B2=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...{SalaryCalcItemGraph.java => SalaryCalcItemGraphTemp.java} | 4 ++--
 .../salary/maintainer/salaryacct/SalaryAcctManager.java       | 4 ++--
 .../salary/service/impl/SalaryAcctResultServiceImpl.java      | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)
 rename src/com/engine/salary/entity/salaryacct/bo/{SalaryCalcItemGraph.java => SalaryCalcItemGraphTemp.java} (98%)

diff --git a/src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraph.java b/src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraphTemp.java
similarity index 98%
rename from src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraph.java
rename to src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraphTemp.java
index 7e8e3690e..67cbef8f4 100644
--- a/src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraph.java
+++ b/src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraphTemp.java
@@ -24,7 +24,7 @@ import java.util.stream.Collectors;
  * @author qiantao
  * @version 1.0
  **/
-public class SalaryCalcItemGraph {
+public class SalaryCalcItemGraphTemp {
 
     private List<SalaryCalcItemGraphNode> nodes;
     private Map<Long, String> items;
@@ -35,7 +35,7 @@ public class SalaryCalcItemGraph {
      * @param salarySobItems  薪资账套的薪资项目
      * @param expressFormulas 公式详情
      */
-    public SalaryCalcItemGraph(List<SalarySobItemPO> salarySobItems, List<SalaryItemPO> salaryItemPOS, List<ExpressFormula> expressFormulas) {
+    public SalaryCalcItemGraphTemp(List<SalarySobItemPO> salarySobItems, List<SalaryItemPO> salaryItemPOS, List<ExpressFormula> expressFormulas) {
         Map<String, SalaryItemPO> salaryItemMap = SalaryEntityUtil.convert2Map(salaryItemPOS, SalaryItemPO::getCode);
         Map<Long, ExpressFormula> expressFormulaMap = SalaryEntityUtil.convert2Map(expressFormulas, ExpressFormula::getId);
         Map<Long, List<FormulaVar>> formulaVarMap = ExpressFormulaBO.buildFormulaVar(expressFormulas);
diff --git a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
index 22f7d879c..5a2715720 100644
--- a/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
+++ b/src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
@@ -7,7 +7,7 @@ import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
 import com.engine.salary.entity.progress.ProgressDTO;
 import com.engine.salary.entity.salaryacct.bo.SalaryAcctCalculateBO;
 import com.engine.salary.entity.salaryacct.bo.SalaryCalcItem;
-import com.engine.salary.entity.salaryacct.bo.SalaryCalcItemGraph;
+import com.engine.salary.entity.salaryacct.bo.SalaryCalcItemGraphTemp;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctEmployeePO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
 import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
@@ -295,7 +295,7 @@ public class SalaryAcctManager extends Service {
                     }).collect(Collectors.toList());
             salarySobItemPOS.addAll(temp);
 
-            SalaryCalcItemGraph salaryCalcItemGraph = new SalaryCalcItemGraph(salarySobItemPOS, salaryItemPOS, expressFormulas);
+            SalaryCalcItemGraphTemp salaryCalcItemGraph = new SalaryCalcItemGraphTemp(salarySobItemPOS, salaryItemPOS, expressFormulas);
             List<SalaryCalcItem> salaryCalcItems = salaryCalcItemGraph.sort();
             List<Long> salarySobItemsWithPriority = SalaryEntityUtil.properties(salaryCalcItems, SalaryCalcItem::getSalaryItemId, Collectors.toList());
 
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index a6c50ea49..09007cb09 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -837,7 +837,7 @@ public class SalaryAcctResultServiceImpl extends Service implements SalaryAcctRe
                     }).collect(Collectors.toList());
             salarySobItemPOS.addAll(temp);
 
-            SalaryCalcItemGraph salaryCalcItemGraph = new SalaryCalcItemGraph(salarySobItemPOS, salaryItemPOS, expressFormulas);
+            SalaryCalcItemGraphTemp salaryCalcItemGraph = new SalaryCalcItemGraphTemp(salarySobItemPOS, salaryItemPOS, expressFormulas);
             List<SalaryCalcItem> salaryCalcItems = salaryCalcItemGraph.sort();
             List<Long> salarySobItemsWithPriority = SalaryEntityUtil.properties(salaryCalcItems, SalaryCalcItem::getSalaryItemId, Collectors.toList());