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

薪酬系统-多语言，拉取release231001分支改动，并处理冲突

This commit is contained in:
sy 2023-10-09 13:26:28 +08:00
parent 05fd1a0e71
commit 7b0c332802
8 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/engine/salary/action/UpdateSISchemeDetailAction.java
View File

@ -118,7 +118,7 @@ public class UpdateSISchemeDetailAction implements Action {
//查询福利方案下的福利项明细
List<InsuranceSchemeDetailPO> insuranceSchemeDetailPOS = getInsuranceSchemeDetailMapper().queryListBySchemeId(targetSchemePO.getId());
if (insuranceSchemeDetailPOS.size() > 0) {
encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class);
encryptUtil.decryptList(insuranceSchemeDetailPOS, InsuranceSchemeDetailPO.class, user);
} else {
requestInfo.getRequestManager().setMessage("错误行" + detailNo + ":" + "该福利方案不存在福利项明细，无法进行修改！");
return FAILURE_AND_CONTINUE;
@ -195,7 +195,7 @@ public class UpdateSISchemeDetailAction implements Action {
}
//更新方案明细
if (updateSchemeDetails.size() > 0) {
encryptUtil.encryptList(updateSchemeDetails, InsuranceSchemeDetailPO.class);
encryptUtil.encryptList(updateSchemeDetails, InsuranceSchemeDetailPO.class, user);
updateSchemeDetails.forEach(getInsuranceSchemeDetailMapper()::updateAll);
}

8
src/com/engine/salary/enums/UserStatusEnum.java
View File

@ -51,10 +51,10 @@ public enum UserStatusEnum implements BaseEnum {
return labelId;
}
// public static String getDefaultLabelByValue(Integer value) {
// Optional<UserStatusEnum> optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst();
// return optional.isPresent() ? optional.get().defaultLabel : "";
// }
public static String getDefaultLabelByValue(Integer value) {
Optional<UserStatusEnum> optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst();
return optional.isPresent() ? optional.get().defaultLabel : "";
}
public static UserStatusEnum parseByValue(Integer value) {
for (UserStatusEnum optionalAdjustReason : UserStatusEnum.values()) {

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

@ -626,9 +626,9 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
public String buildViewStatus(String status) {
if (Objects.equals(status, "true")) {
return SalaryI18nUtil.getI18nLabel(0, "已查看");
return SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "已查看");
} else {
return SalaryI18nUtil.getI18nLabel(0, "未查看");
return SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "未查看");
}
}
@ -637,10 +637,10 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
return "";
}
if (Objects.equals("true", status)) {
return SalaryI18nUtil.getI18nLabel(0, "成功");
return SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "成功");
}
if (Objects.equals("false", status)) {
return SalaryI18nUtil.getI18nLabel(0, "失败");
return SalaryI18nUtil.getI18nLabel(user.getLanguage(), 25009, "失败");
}
return "";
}
@ -762,12 +762,12 @@ public class SalaryStatisticsPushServiceImpl extends Service implements SalarySt
List<Long> batchIds = successPushDetailList.stream().map(SalaryStatisticsPushDetailPO::getBatchId).collect(Collectors.toList());
List<SalaryStatisticsPushPO> pushList= getPushListByReportIdAndIds(reportId,batchIds);
if (CollectionUtils.isEmpty(pushList)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"暂无权限查看该报表"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),0,"暂无权限查看该报表"));
}
// 校验是否在分享的有效时间内
pushList = filterReportByTime(pushList);
if (CollectionUtils.isEmpty(pushList)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该报表的分享不在有效期内，无法查看"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),0,"该报表的分享不在有效期内，无法查看"));
}
return pushList;
}

2
src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
View File

@ -87,7 +87,7 @@ public class ColumnBuildServiceImpl extends Service implements ColumnBuildServic
if (!paymentStatus.equals(PaymentStatusEnum.BALANCE.getValue())) {
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542268, "公积金账号"), "fundAccount"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542269, "fundSchemeName"));
list.add(new WeaTableColumn("150px",SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542269, "公积金方案名称"),"fundSchemeName"));
}
//组装公积金基数

4
src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
View File

@ -409,7 +409,7 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
if(subCompanyInfos.size() == 0 && deptInfos.size() > 1) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0, "系统中存在重复部门信息，无法指定当前人员关联的唯一部门，请细化部门上级部门或填写部门所属的分部信息来缩小部门筛选范围"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "系统中存在重复部门信息，无法指定当前人员关联的唯一部门，请细化部门上级部门或填写部门所属的分部信息来缩小部门筛选范围"));
excelComments.add(errorMessageMap);
} else if (subCompanyInfos.size() > 1 && deptInfos.size() == 0) {
//部门结果数为0，分部结果数大于1，则无法匹配
@ -432,7 +432,7 @@ public class ExtEmpServiceImpl extends Service implements ExtEmpService {
} else if (targetDeptInfos.size() > 1) {
isError = true;
Map<String, String> errorMessageMap = Maps.newHashMap();
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(0, "该组数据中的部门和分部信息在系统中出现多组匹配的部门和分部组合，无法指定唯一的部门和分部组合"));
errorMessageMap.put("message", row + SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "该组数据中的部门和分部信息在系统中出现多组匹配的部门和分部组合，无法指定唯一的部门和分部组合"));
excelComments.add(errorMessageMap);
} else {
targetSubCompanyInfos = subCompanyInfos.stream().filter(f -> f.getId().equals(targetDeptInfos.get(0).getSubcompanyid1())).collect(Collectors.toList());

4
src/com/engine/salary/service/impl/SIAccountServiceImpl.java
View File

@ -1501,7 +1501,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
SalaryI18nUtil.getI18nLabel(user.getLanguage(),542443, "账单月份"));
// List<String> dataIndexList = Lists.newArrayList("username", "departmentName", "mobile", "workcode", "taxAgentName", "billMonth");
List<String> dataIndexList = Lists.newArrayList("userName", "department", "mobile", "workcode", "socialPayOrg", "billMonth");
// 查询福利核算项目
// 查询福利核算项目
List<String> welfareNames = (List<String>) param.getWelfareNames();
headerList.addAll(welfareNames);
//匹配welfareName对应的id
@ -1537,7 +1537,7 @@ public class SIAccountServiceImpl extends Service implements SIAccountService {
//非系统人员核算明细
List<AccountExportPO> extAccountExportPOS = getInsuranceExportMapper().exportExtAccount(PaymentStatusEnum.COMMON.getValue(), exportParam);
accountExportPOS.addAll(extAccountExportPOS);
encryptUtil.decryptList(accountExportPOS, AccountExportPO.class);
encryptUtil.decryptList(accountExportPOS, AccountExportPO.class, user);
// 数据组装
List<Map<String, Object>> records = getSIExportService(user).buildCommonRecords(accountExportPOS);

3
src/com/engine/salary/service/impl/SIExportServiceImpl.java
View File

@ -50,7 +50,6 @@ import java.util.*;
import java.util.function.Function;
import java.util.stream.Collectors;
import static com.engine.salary.enums.UserStatusEnum.getDefaultLabelByValue;
import static com.engine.salary.sys.constant.SalarySysConstant.OPEN_ACCT_RESULT_SUM;
/**
@ -208,7 +207,7 @@ public class SIExportServiceImpl extends Service implements SIExportService {
records = buildCommonRecords(accountExportPOS);
List<List<Object>> excelSheetData = new ArrayList<>();
//工作簿名称
String sheetName = SalaryI18nUtil.getI18nLabel(user.getLanguage(), 0, "社保福利台账");
String sheetName = SalaryI18nUtil.getI18nLabel(user.getLanguage(), 538002, "社保福利台账");
excelSheetData.add(Arrays.asList(columns.stream().map(WeaTableColumn::getText).toArray(String[]::new)));
//合计
boolean total = false;

13
src/com/engine/salary/service/impl/SISchemeServiceImpl.java
View File

@ -1200,7 +1200,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
HashMap<String, String> oldSocialBaseMap = new HashMap<>();
if (oldSocialSchemeInfos.size() > 0) {
oldSocialSchemePO = oldSocialSchemeInfos.get(0);
encryptUtil.decrypt(oldSocialSchemePO, InsuranceArchivesSocialSchemePO.class);
encryptUtil.decrypt(oldSocialSchemePO, InsuranceArchivesSocialSchemePO.class, user);
BeanUtils.copyProperties(oldSocialSchemePO, insuranceArchivesSocialSchemePO);
//社保基数
oldSocialBaseMap = JSON.parseObject(oldSocialSchemePO.getSocialPaymentBaseString(), new HashMap<String, String>().getClass());
@ -1281,7 +1281,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
HashMap<String, String> oldFundBaseMap = new HashMap<>();
if (oldFundSchemeInfos.size() > 0) {
oldFundSchemePO = oldFundSchemeInfos.get(0);
encryptUtil.decrypt(oldFundSchemePO, InsuranceArchivesFundSchemePO.class);
encryptUtil.decrypt(oldFundSchemePO, InsuranceArchivesFundSchemePO.class, user);
BeanUtils.copyProperties(oldFundSchemePO, insuranceArchivesFundSchemePO);
//社保基数
oldFundBaseMap = JSON.parseObject(oldFundSchemePO.getFundPaymentBaseString(), new HashMap<String, String>().getClass());
@ -1363,7 +1363,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
HashMap<String, String> oldOtherBaseMap = new HashMap<>();
if (oldOtherSchemeInfos.size() > 0) {
oldOtherSchemePO = oldOtherSchemeInfos.get(0);
encryptUtil.decrypt(oldOtherSchemePO, InsuranceArchivesOtherSchemePO.class);
encryptUtil.decrypt(oldOtherSchemePO, InsuranceArchivesOtherSchemePO.class, user);
BeanUtils.copyProperties(oldOtherSchemePO, insuranceArchivesOtherSchemePO);
//社保基数
oldOtherBaseMap = JSON.parseObject(oldOtherSchemePO.getOtherPaymentBaseString(), new HashMap<String, String>().getClass());
@ -1721,14 +1721,15 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
f.setUpdateTime(new Date());
}
});
encryptUtil.encryptList(schemeDetailPOS, InsuranceSchemeDetailPO.class);
encryptUtil.encryptList(schemeDetailPOS, InsuranceSchemeDetailPO.class, user);
schemeDetailPOS.forEach(getInsuranceSchemeDetailMapper()::updateAll);
} else {
errorInfo.add("方案id:" + primaryId + "," + "表中不存在方案明细数据");
errorInfo.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "方案id:") + primaryId + ","
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "表中不存在方案明细数据"));
}
} catch (Exception e) {
errorInfo.add("方案id:" + primaryId + "," + e.getMessage());
errorInfo.add(SalaryI18nUtil.getI18nLabel(user.getLanguage(),0, "方案id:") + primaryId + "," + e.getMessage());
}
return errorInfo;
}