From e3d5ca78f4c66877bcce997d1e9a2d13932a37f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Mon, 4 Nov 2024 10:53:21 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B4=A6=E5=A5=97=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../entity/salarysob/bo/SalarySobRangeBO.java | 31 +------------------
 .../salarysob/dto/SalarySobRangeListDTO.java  |  2 +-
 2 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
index ff4f3b076..743555800 100644
--- a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
+++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java
@@ -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))
diff --git a/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java b/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
index ea63898c1..1d6d234dc 100644
--- a/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
+++ b/src/com/engine/salary/entity/salarysob/dto/SalarySobRangeListDTO.java
@@ -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")