qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

防止冲突

This commit is contained in:
钱涛 2024-11-26 11:45:48 +08:00
parent bd38f11889
commit ce34e86724
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraph.java → src/com/engine/salary/entity/salaryacct/bo/SalaryCalcItemGraphTemp.java
View File

@ -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);

4
src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java
View File

@ -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());

2
src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
View File

@ -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());