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

二开，引用上月数据功能

This commit is contained in:
钱涛 2025-05-14 10:26:50 +08:00
parent 5f97577b86
commit 639330cf85
4 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java
View File

@ -135,6 +135,7 @@ public class SalarySobItemAggregateBO {
.pattern(Optional.ofNullable(salarySobItemPO.getPattern()).orElse(salaryItemPO.getPattern()))
.name(salaryItemPO.getName())
.itemHide(salarySobItemPO.getItemHide())
.quote(salarySobItemPO.getQuote() == null ? 0 : salarySobItemPO.getQuote())
.formulaId(salarySobItemPO.getFormulaId())
.formulaContent(formulaMap.getOrDefault(salarySobItemPO.getFormulaId(), ""))
.originFormulaContent(valueType == SalaryValueTypeEnum.FORMULA.getValue() ? formulaMap.getOrDefault(salarySobItemPO.getFormulaId(), "") : "")

2
src/com/engine/salary/entity/salarysob/dto/SalarySobItemDTO.java
View File

@ -100,6 +100,8 @@ public class SalarySobItemDTO {
@JsonSerialize(using = ToStringSerializer.class)
private Long itemHide;
private Integer quote;
/**
* 进位规则
*/

1
src/com/engine/salary/entity/salarysob/dto/SalarySobItemFormDTO.java
View File

@ -38,6 +38,7 @@ public class SalarySobItemFormDTO {
//核算时隐藏")
@DataCheck(require = true, runtime = {RuntimeTypeEnum.UPDATE}, message = "核算时隐藏不允许为空")
private Integer itemHide;
private Integer quote;
//字段类型
/**

5
src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
View File

@ -551,7 +551,7 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
}
salarySobItemPO.setFormula(formulaPO);
}
if(SalaryEntityUtil.isNotNullOrEmpty(salarySobItemPO.getSalaryItemId())){
if (SalaryEntityUtil.isNotNullOrEmpty(salarySobItemPO.getSalaryItemId())) {
SalaryItemPO salaryItemPO = itemIdMap.get(salarySobItemPO.getSalaryItemId());
salarySobItemPO.setSalaryItem(salaryItemPO);
}
@ -599,7 +599,8 @@ public class SalarySobItemServiceImpl extends Service implements SalarySobItemSe
salarySobItemFormDTO
.setId(salarySobItemPO.getId())
.setName(salaryItemPO.getName())
.setItemHide(salarySobItemPO.getItemHide()==null?0:Integer.parseInt(salarySobItemPO.getItemHide().toString()))
.setItemHide(salarySobItemPO.getItemHide() == null ? 0 : Integer.parseInt(salarySobItemPO.getItemHide().toString()))
.setQuote(salarySobItemPO.getItemHide() == null ? 0 : salarySobItemPO.getQuote())
.setDataType(salaryItemPO.getDataType())
.setRoundingMode(salarySobItemPO.getRoundingMode() == null ? salaryItemPO.getRoundingMode() : salarySobItemPO.getRoundingMode())
.setPattern(salarySobItemPO.getPattern() == null ? salaryItemPO.getPattern() : salarySobItemPO.getPattern())