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

修改账套状态类型

This commit is contained in:
钱涛 2024-11-04 10:53:21 +08:00
parent 906a432ec2
commit e3d5ca78f4
2 changed files with 2 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
View File

@ -57,35 +57,6 @@ public class SalarySobRangeBO {
resultParams.add(queryParam);
});
return resultParams;
// Map<Integer, List<SalarySobRangePO>> rangeMap = SalaryEntityUtil.group2Map(salarySobRanges, SalarySobRangePO::getTargetType);
// List<SalarySobRangeEmpQueryParam> resultParams = Lists.newArrayListWithExpectedSize(rangeMap.size());
// rangeMap.forEach((targetType, salarySobRangePOS) -> {
// List<String> employeeStatus = salarySobRangePOS.stream()
// .map(e -> SalaryEmployeeStatusEnum.parseByValue(e.getEmployeeStatus()))
// .filter(Objects::nonNull)
// .map(e -> e.name().toLowerCase())
// .distinct()
// .collect(Collectors.toList());
// if (employeeStatus.contains(SalaryEmployeeStatusEnum.ALL.name().toLowerCase())) {
// employeeStatus = Collections.emptyList();
// }
// if (employeeStatus.contains(SalaryEmployeeStatusEnum.NORMAL.name().toLowerCase())) {
// employeeStatus = UserStatusEnum.getNormalStatus();
// }
// if (employeeStatus.contains(SalaryEmployeeStatusEnum.UNAVAILABLE.name().toLowerCase())) {
// employeeStatus = UserStatusEnum.getUnavailableStatus();
// }
// TargetTypeEnum targetTypeEnum = TargetTypeEnum.parseByValue(targetType);
// SalarySobRangeEmpQueryParam queryParam = SalarySobRangeEmpQueryParam.builder()
// .targetType(Optional.ofNullable(targetTypeEnum).map(TargetTypeEnum::name).orElse(StringUtils.EMPTY))
// .targetIds(SalaryEntityUtil.properties(salarySobRangePOS, SalarySobRangePO::getTargetId))
// .employeeStatus(employeeStatus)
// .build();
// resultParams.add(queryParam);
// });
// return resultParams;
}
/**
@ -117,7 +88,7 @@ public class SalarySobRangeBO {
return SalarySobRangeListDTO.builder()
.id(salarySobRangePO.getId())
.salarySobId(salarySobRangePO.getSalarySobId())
.targetType(targetTypeEnum != null ? targetTypeEnum.getValue() : -1)
.targetType(targetTypeEnum)
.targetTypeName(Optional.ofNullable(targetTypeEnum)
.map(e -> SalaryI18nUtil.getI18nLabel(e.getLabelId(), e.getDefaultLabel()))
.orElse(StringUtils.EMPTY))

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

@ -37,7 +37,7 @@ public class SalarySobRangeListDTO {
*
* @see TargetTypeEnum
*/
private Integer targetType;
private TargetTypeEnum targetType;
@SalaryTableColumn(text = "对象类型", width = "10%", column = "targetTypeName")
@TableTitle(title = "对象类型", dataIndex = "targetTypeName", key = "targetTypeName")