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

自定义工资项目展示名fix补发

This commit is contained in:
Harryxzy 2023-07-20 15:57:27 +08:00
parent 84d9184959
commit 19c297dfe9
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateReplenishFormDTO.java
View File

@ -6,6 +6,7 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import java.util.List;
import java.util.Map;
/**
* @author Harryxzy
@ -27,6 +28,6 @@ public class SalaryTemplateReplenishFormDTO {
private List<SalaryTemplateSalaryItemSetListDTO> replenishSalaryTemplateSalaryItemSet;
// 工资单项目名称设置
private List<SalaryBillItemNameDTO> salaryBillItemNameSet;
private Map<Long, SalaryBillItemNameDTO> salaryBillItemNameSet;
}

7
src/com/engine/salary/wrapper/SalaryTemplateWrapper.java
View File

@ -411,7 +411,7 @@ public class SalaryTemplateWrapper extends Service {
// 补发薪资项目设置
List<SalaryTemplateSalaryItemSetListDTO> replenishSalaryItemSetting;
// 补发薪资项目显示名称
List<SalaryBillItemNameDTO> salaryBillItemNameDTOS = new ArrayList<>();
Map<Long, SalaryBillItemNameDTO> salaryBillItemNameDTOMap = new HashMap<>();
if (id != null) {
SalaryTemplatePO po = getSalaryTemplateService(user).getById(id);
if (po == null) {
@ -427,7 +427,8 @@ public class SalaryTemplateWrapper extends Service {
List<SalaryBillItemNamePO> billItemNameList = getSalaryBillItemNameService(user).ListByTemplateAndType(SalaryBillItemNamePO.builder().salaryTemplateId(id).salaryBillType(1).build());
Map<Long, String> itemShowNameMap = SalaryEntityUtil.convert2Map(billItemNameList, SalaryBillItemNamePO::getSalaryItemId, SalaryBillItemNamePO::getSalaryItemShowName);
// 获取薪资项目信息
salaryBillItemNameDTOS = SalaryBillItemNameBO.convert2ListDTO(billItemNameList, itemIdNameMap);
List<SalaryBillItemNameDTO> salaryBillItemNameDTOS = SalaryBillItemNameBO.convert2ListDTO(billItemNameList, itemIdNameMap);
salaryBillItemNameDTOMap = SalaryEntityUtil.convert2Map(salaryBillItemNameDTOS, SalaryBillItemNameDTO::getSalaryItemId);
if (CollectionUtils.isNotEmpty(replenishSalaryItemSetting)) {
replenishSalaryItemSetting.stream()
@ -455,7 +456,7 @@ public class SalaryTemplateWrapper extends Service {
return SalaryTemplateReplenishFormDTO.builder()
.id(id)
.replenishSalaryTemplateSalaryItemSet(replenishSalaryItemSetting)
.salaryBillItemNameSet(salaryBillItemNameDTOS)
.salaryBillItemNameSet(salaryBillItemNameDTOMap)
.build();
}