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

薪酬系统-多语言，修复调薪记录、新建薪资账套、工资单查看页面问题

This commit is contained in:
sy 2023-08-08 09:34:22 +08:00
parent 059d3982cc
commit ec5c4d1305
6 changed files with 41 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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<Integer> enumsList = Arrays.asList(split).stream().map(item-> Integer.valueOf(item)).collect(Collectors.toList());
List<SalaryEmployeeStatusEnum> salaryEmployeeStatusEnums = SalaryEmployeeStatusEnum.parseByValues(enumsList);
StringBuilder sb = new StringBuilder();
for(int i=0 ; i<salaryEmployeeStatusEnums.size();i++){
sb.append(salaryEmployeeStatusEnums.get(i).getDefaultLabel());
// sb.append(salaryEmployeeStatusEnums.get(i).getDefaultLabel());
sb.append(SalaryI18nUtil.getI18nLabel(user.getLanguage(),salaryEmployeeStatusEnums.get(i).getLabelId(), salaryEmployeeStatusEnums.get(i).getDefaultLabel()));
if(i+1!=salaryEmployeeStatusEnums.size()){
sb.append(",");
}

9
src/com/engine/salary/enums/salarybill/BillConfimStatusEnum.java
View File

@ -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 BillConfimStatusEnum
@ -68,4 +69,12 @@ public enum BillConfimStatusEnum implements BaseEnum<Integer> {
}
return "";
}
public static BillConfimStatusEnum parseByValue(int value) {
for (BillConfimStatusEnum optionalAdjustReason : BillConfimStatusEnum.values()) {
if (Objects.equals(optionalAdjustReason.getValue(), value)) {
return optionalAdjustReason;
}
}
return null;
}
}

10
src/com/engine/salary/enums/salarybill/BillReadStatusEnum.java
View File

@ -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<Integer> {
}
return "";
}
public static BillReadStatusEnum parseByValue(int value) {
for (BillReadStatusEnum optionalAdjustReason : BillReadStatusEnum.values()) {
if (Objects.equals(optionalAdjustReason.getValue(), value)) {
return optionalAdjustReason;
}
}
return null;
}
}

9
src/com/engine/salary/mapper/archive/SalaryArchiveItemMapper.xml
View File

@ -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
</sql>
<sql id="paramSql">

10
src/com/engine/salary/service/impl/SalarySendServiceImpl.java
View File

@ -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()));
}
});
}

12
src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java
View File

@ -258,12 +258,12 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM
PageInfo<TaxAgentManageRangeListDTO> dtoPage = SalaryPageUtil.buildPage(queryParam.getCurrent(), queryParam.getPageSize(), TaxAgentManageRangeListDTO.class, user);
// 查询人员状态
// List<HrmStatus> hrmStatusList = hrmCommonHrmStatusService.list();
// List<HrmStatus> hrmStatusList = UserStatusEnum.getHrmStatusList();
List<UserStatusEnum> userStatusEnumList = UserStatusEnum.getEffectiveList();
List<HrmStatus> 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<HrmStatus> hrmStatusList = UserStatusEnum.getHrmStatusList();
// List<UserStatusEnum> userStatusEnumList = UserStatusEnum.getEffectiveList();
// List<HrmStatus> 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<TaxAgentManageRangeListDTO> taxAgentManageRangeList = TaxAgentBO.convert2ListDTO(taxAgentManageRanges, employeeComInfos, departmentComInfos, subDepartmentComInfos, positionComInfos, hrmStatusList, user);
// 根据对象名称过滤