From ec5c4d1305828c307a26d7350c3ecdbcd8a3ad24 Mon Sep 17 00:00:00 2001 From: sy Date: Tue, 8 Aug 2023 09:34:22 +0800 Subject: [PATCH] =?UTF-8?q?=E8=96=AA=E9=85=AC=E7=B3=BB=E7=BB=9F-=E5=A4=9A?= =?UTF-8?q?=E8=AF=AD=E8=A8=80=EF=BC=8C=E4=BF=AE=E5=A4=8D=E8=B0=83=E8=96=AA?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E3=80=81=E6=96=B0=E5=BB=BA=E8=96=AA=E8=B5=84?= =?UTF-8?q?=E8=B4=A6=E5=A5=97=E3=80=81=E5=B7=A5=E8=B5=84=E5=8D=95=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../salary/entity/salarysob/bo/SalarySobRangeBO.java | 7 ++++--- .../enums/salarybill/BillConfimStatusEnum.java | 9 +++++++++ .../salary/enums/salarybill/BillReadStatusEnum.java | 10 ++++++++++ .../mapper/archive/SalaryArchiveItemMapper.xml | 9 ++++++--- .../salary/service/impl/SalarySendServiceImpl.java | 10 ++++++---- .../service/impl/TaxAgentManageRangeServiceImpl.java | 12 ++++++------ 6 files changed, 41 insertions(+), 16 deletions(-) diff --git a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java index b9b1a79b5..6ab20ef46 100644 --- a/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java +++ b/src/com/engine/salary/entity/salarysob/bo/SalarySobRangeBO.java @@ -116,7 +116,7 @@ public class SalarySobRangeBO { .map(salarySobRangePO -> { TargetTypeEnum targetTypeEnum = TargetTypeEnum.parseByValue(salarySobRangePO.getTargetType()); - String employeeStatusesStr = parseByEmployeeStatuses(salarySobRangePO.getEmployeeStatuses()); + String employeeStatusesStr = parseByEmployeeStatuses(salarySobRangePO.getEmployeeStatuses(), user); return SalarySobRangeListDTO.builder() .id(salarySobRangePO.getId()) .salarySobId(salarySobRangePO.getSalarySobId()) @@ -137,13 +137,14 @@ public class SalarySobRangeBO { * @param employeeStatuses * @return */ - private static String parseByEmployeeStatuses(String employeeStatuses) { + private static String parseByEmployeeStatuses(String employeeStatuses, User user) { String[] split = employeeStatuses.split(","); List enumsList = Arrays.asList(split).stream().map(item-> Integer.valueOf(item)).collect(Collectors.toList()); List salaryEmployeeStatusEnums = SalaryEmployeeStatusEnum.parseByValues(enumsList); StringBuilder sb = new StringBuilder(); for(int i=0 ; i { } return ""; } + public static BillConfimStatusEnum parseByValue(int value) { + for (BillConfimStatusEnum optionalAdjustReason : BillConfimStatusEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; + } + } + return null; + } } diff --git a/src/com/engine/salary/enums/salarybill/BillReadStatusEnum.java b/src/com/engine/salary/enums/salarybill/BillReadStatusEnum.java index 09fd47107..e6e9f57d6 100644 --- a/src/com/engine/salary/enums/salarybill/BillReadStatusEnum.java +++ b/src/com/engine/salary/enums/salarybill/BillReadStatusEnum.java @@ -3,6 +3,7 @@ package com.engine.salary.enums.salarybill; import com.engine.salary.enums.BaseEnum; import java.util.Arrays; +import java.util.Objects; /** * @ClassName BillReadStatusEnum @@ -67,4 +68,13 @@ public enum BillReadStatusEnum implements BaseEnum { } return ""; } + + public static BillReadStatusEnum parseByValue(int value) { + for (BillReadStatusEnum optionalAdjustReason : BillReadStatusEnum.values()) { + if (Objects.equals(optionalAdjustReason.getValue(), value)) { + return optionalAdjustReason; + } + } + return null; + } } diff --git a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml index db76c9cb2..f42369f42 100644 --- a/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml +++ b/src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml @@ -606,7 +606,8 @@ t1.operate_time, t1.description, t1.salary_archive_id, - t1.salary_item_id + t1.salary_item_id, + o.status AS employeeStatus FROM hrsa_salary_archive_item t1 LEFT JOIN hrmresource o ON o.id = t1.operator @@ -678,7 +679,8 @@ t1.operate_time, t1.description, t1.salary_archive_id, - t1.salary_item_id + t1.salary_item_id, + o.status AS employeeStatus FROM hrsa_salary_archive_item t1 LEFT JOIN hrmresource o ON o.id = t1.operator @@ -752,7 +754,8 @@ t1.operate_time, t1.description, t1.salary_archive_id, - t1.salary_item_id + t1.salary_item_id, + o.status AS employeeStatus diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java index 8dfa7d765..f695f2deb 100644 --- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java +++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java @@ -679,14 +679,16 @@ public class SalarySendServiceImpl extends Service implements SalarySendService pageInfo.getList().stream().forEach(obj -> { SalarySendInfoListDTO dto = (SalarySendInfoListDTO) obj; if (StringUtils.isBlank( dto.getBillReadStatus() )){ - dto.setBillReadStatus(BillReadStatusEnum.UNREAD.getDefaultLabel()); + dto.setBillReadStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),BillReadStatusEnum.UNREAD.getLabelId(), BillReadStatusEnum.UNREAD.getDefaultLabel())); } else { - dto.setBillReadStatus(BillReadStatusEnum.getDefaultLabelByValue( Integer.valueOf(dto.getBillReadStatus()) )); + BillReadStatusEnum billReadStatusEnum = BillReadStatusEnum.parseByValue(Integer.valueOf(dto.getBillReadStatus())); + dto.setBillReadStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(),billReadStatusEnum.getLabelId(), billReadStatusEnum.getDefaultLabel())); } if (StringUtils.isBlank(dto.getBillConfirmStatus())){ - dto.setBillConfirmStatus(BillConfimStatusEnum.UNCONFIRMED.getDefaultLabel()); + dto.setBillConfirmStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(), BillConfimStatusEnum.UNCONFIRMED.getLabelId(), BillConfimStatusEnum.UNCONFIRMED.getDefaultLabel())); } else { - dto.setBillConfirmStatus(BillConfimStatusEnum.getDefaultLabelByValue( Integer.valueOf(dto.getBillConfirmStatus()) )); + BillConfimStatusEnum billConfimStatusEnum = BillConfimStatusEnum.parseByValue(Integer.valueOf(dto.getBillConfirmStatus())); + dto.setBillConfirmStatus(SalaryI18nUtil.getI18nLabel(user.getLanguage(), billConfimStatusEnum.getLabelId(), billConfimStatusEnum.getDefaultLabel())); } }); } diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index 8cb5fcd55..91af48fd4 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -258,12 +258,12 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM PageInfo dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentManageRangeListDTO.class, user); // 查询人员状态 // List hrmStatusList = hrmCommonHrmStatusService.list(); -// List hrmStatusList = UserStatusEnum.getHrmStatusList(); - List userStatusEnumList = UserStatusEnum.getEffectiveList(); - List hrmStatusList = new ArrayList<>(); - userStatusEnumList.forEach(f -> { - hrmStatusList.add(HrmStatus.builder().id(f.getValue().toString()).name(SalaryI18nUtil.getI18nLabel(user.getLanguage(),f.getLabelId(), f.getDefaultLabel())).build()); - }); + List hrmStatusList = UserStatusEnum.getHrmStatusList(); +// List userStatusEnumList = UserStatusEnum.getEffectiveList(); +// List hrmStatusList = new ArrayList<>(); +// userStatusEnumList.forEach(f -> { +// hrmStatusList.add(HrmStatus.builder().id(f.getValue().toString()).name(SalaryI18nUtil.getI18nLabel(user.getLanguage(),f.getLabelId(), f.getDefaultLabel())).build()); +// }); // 薪资账套的人员范围po转换成列表dto List taxAgentManageRangeList = TaxAgentBO.convert2ListDTO(taxAgentManageRanges, employeeComInfos, departmentComInfos, subDepartmentComInfos, positionComInfos, hrmStatusList, user); // 根据对象名称过滤