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

港湾多语言

This commit is contained in:
Harryxzy 2024-04-03 10:32:03 +08:00
parent c0562d9c6b
commit 7ed5e87d3f
9 changed files with 94 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
View File

@ -21,17 +21,16 @@ import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import com.engine.salary.util.SalaryDateUtil;
import com.engine.salary.util.SalaryI18nUtil;
import com.engine.salary.util.db.IdGenerator;
import com.engine.salary.util.excel.ExcelComment;
import com.google.common.base.Joiner;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.engine.salary.util.db.IdGenerator;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import weaver.general.Util;
import weaver.hrm.User;
import weaver.hrm.User;
import java.time.LocalDate;
import java.util.*;
@ -476,7 +475,7 @@ public class SalaryArchiveExcelBO extends Service {
// 4.调整原因[薪资项目]
// String adjustReason = SalaryArchiveItemAdjustReasonEnum.getValueByDefaultLabel(Optional.ofNullable(map.get(adjustReasonI18n)).orElse("").toString());
String adjustReason = "";
List<Map<String, String>> adjustReasonList = SalaryArchiveItemAdjustReasonEnum.getList();
List<Map<String, String>> adjustReasonList = SalaryArchiveItemAdjustReasonEnum.getList(user);
for (Map<String, String> reasonMap : adjustReasonList){
String reason = SalaryI18nUtil.getI18nLabel(user.getLanguage(), Integer.parseInt(reasonMap.get("labelId")), reasonMap.get("content")).trim();
if (reason.equals(Optional.ofNullable(map.get(adjustReasonI18n)).orElse("").toString().trim())) {

20
src/com/engine/salary/entity/siaccount/bo/InsuranceComparisonResultBO.java
View File

@ -1,9 +1,6 @@
package com.engine.salary.entity.siaccount.bo;
import com.alibaba.fastjson.JSON;
import com.engine.salary.entity.salaryacct.po.ExcelAcctResultPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.entity.salarysob.dto.SalarySobEmpFieldDTO;
import com.engine.salary.entity.sicategory.po.ICategoryPO;
import com.engine.salary.entity.siexport.po.AccountExportPO;
import com.engine.salary.entity.siexport.po.ExcelAccountExportPO;
@ -21,7 +18,10 @@ import com.google.common.collect.Maps;
import weaver.general.Util;
import weaver.hrm.User;
import java.util.*;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
@ -72,9 +72,9 @@ public class InsuranceComparisonResultBO {
if (welBaseDiffSign) {
List<Column> socialComColumns = Lists.newArrayList();
for (ICategoryPO po : socialWelfareList) {
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
, po.getId() + "socialPerBase", po.getId() + "socialPerBase"));
socialComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
socialComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
, po.getId() + "socialComBase", po.getId() + "socialComBase"));
}
columns.addAll(socialComColumns);
@ -92,9 +92,9 @@ public class InsuranceComparisonResultBO {
if (welBaseDiffSign) {
List<Column> fundComColumns = Lists.newArrayList();
for (ICategoryPO po : fundWelfareList) {
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
, po.getId() + "fundPerBase", po.getId() + "fundPerBase"));
fundComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
fundComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
, po.getId() + "fundComBase", po.getId() + "fundComBase"));
}
columns.addAll(fundComColumns);
@ -112,9 +112,9 @@ public class InsuranceComparisonResultBO {
if (welBaseDiffSign) {
List<Column> otherComColumns = Lists.newArrayList();
for (ICategoryPO po : otherWelfareList) {
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
columns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人")
, po.getId() + "otherPerBase", po.getId() + "otherPerBase"));
otherComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
otherComColumns.add(new Column(po.getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位")
, po.getId() + "otherComBase", po.getId() + "otherComBase"));
}
columns.addAll(otherComColumns);

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

@ -2,6 +2,7 @@ package com.engine.salary.enums;
import com.engine.salary.entity.hrm.HrmStatus;
import com.engine.salary.util.SalaryI18nUtil;
import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
@ -56,6 +57,11 @@ public enum UserStatusEnum implements BaseEnum {
return optional.isPresent() ? optional.get().defaultLabel : "";
}
public static String getDefaultLabelByValueWithI18n(Integer value, User user) {
Optional<UserStatusEnum> optional = Arrays.stream(UserStatusEnum.values()).filter(r -> r.getValue().equals(value)).findFirst();
return optional.isPresent() ? SalaryI18nUtil.getI18nLabel(user.getLanguage(), optional.get().getLabelId() ,optional.get().defaultLabel) : "";
}
public static UserStatusEnum parseByValue(Integer value) {
for (UserStatusEnum optionalAdjustReason : UserStatusEnum.values()) {
if (Objects.equals(optionalAdjustReason.getValue(), value)) {

5
src/com/engine/salary/enums/salaryarchive/SalaryArchiveItemAdjustReasonEnum.java
View File

@ -2,6 +2,7 @@ package com.engine.salary.enums.salaryarchive;
import com.engine.salary.enums.BaseEnum;
import com.engine.salary.util.SalaryI18nUtil;
import weaver.hrm.User;
import java.util.*;
import java.util.stream.Collectors;
@ -77,11 +78,11 @@ public enum SalaryArchiveItemAdjustReasonEnum implements BaseEnum<String> {
return null;
}
public static List<Map<String, String>> getList(){
public static List<Map<String, String>> getList(User user){
return Arrays.stream(SalaryArchiveItemAdjustReasonEnum.values()).map(e -> {
Map<String, String> map = new HashMap<>();
map.put("id", e.getValue());
map.put("content", e.getDefaultLabel());
map.put("content", SalaryI18nUtil.getI18nLabel(user.getUID(),e.getLabelId(), e.getDefaultLabel()));
map.put("labelId", String.valueOf(e.getLabelId()));
return map;
}).collect(Collectors.toList());

77
src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
View File

@ -1728,7 +1728,7 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
map.put("siSchemeId", item.getSiSchemeId());
map.put("fundSchemeId", item.getFundSchemeId());
map.put("otherSchemeId", item.getOtherSchemeId());
map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValue(item.getUserStatus()) : "");
map.put("status", item.getUserStatus() != null ? UserStatusEnum.getDefaultLabelByValueWithI18n(item.getUserStatus(), user) : "");
map.put("baseInfo", item.getBaseInfoId());
map.put("paymentOrganization", item.getPaymentOrganization());
if (socialItem != null) {
@ -1940,34 +1940,33 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
Map<Integer, Map<String, String>> titleMap = buildColumnTitle(insuranceArchivesEmployeePOS);
List<WeaTableColumn> list = new ArrayList<>();
WeaTableColumn nameColumn = new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(0, "姓名"), "employeeName");
WeaTableColumn nameColumn = new WeaTableColumn("100px", SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034, "姓名"), "employeeName");
nameColumn.setFixed("left");
list.add(nameColumn);
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), "paymentOrganizationName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(33553, "分部"), "subcompanyName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(27511, "部门"), "departmentName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(125238, "手机号"), "mobile"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(15890, "员工状态"), "status"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(1933, "工号"), "jobNum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(1516, "入职日期"), "companystartdate"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 537996, "个税扣缴义务人"), "paymentOrganizationName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 33553, "分部"), "subcompanyName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 27511, "部门"), "departmentName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 125238, "手机号"), "mobile"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 15890, "员工状态"), "status"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 1933, "工号"), "jobNum"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 1516, "入职日期"), "companystartdate"));
// list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(0, "合同到期日期"), "dismissdate"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542267, "社保方案名称"), "socialName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542267, "社保方案名称"), "socialName"));
titleMap.get(WelfareTypeEnum.SOCIAL_SECURITY.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k)));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(81594, "社保账号"), "socialAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542507, "社保起始缴纳月"), "socialStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542508, "社保最后缴纳月"), "socialEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542269, "公积金方案名称"), "fundName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542268, "公积金账号"), "fundAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 81594, "社保账号"), "socialAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542507, "社保起始缴纳月"), "socialStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542508, "社保最后缴纳月"), "socialEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542269, "公积金方案名称"), "fundName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542268, "公积金账号"), "fundAccount"));
titleMap.get(WelfareTypeEnum.ACCUMULATION_FUND.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k)));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542270, "补充公积金账号"), "supplementFundAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542509, "公积金起始缴纳月"), "fundStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542510, "公积金最后缴纳月"), "fundEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542271, "其他福利方案名称"), "otherName"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542270, "补充公积金账号"), "supplementFundAccount"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542509, "公积金起始缴纳月"), "fundStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542510, "公积金最后缴纳月"), "fundEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542271, "其他福利方案名称"), "otherName"));
titleMap.get(WelfareTypeEnum.OTHER.getValue()).forEach((k, v) -> list.add(new WeaTableColumn("150px", v, k)));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542511, "其他福利起始缴纳月"), "otherStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(542512, "其他福利最后缴纳月"), "otherEndTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542511, "其他福利起始缴纳月"), "otherStartTime"));
list.add(new WeaTableColumn("150px", SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542512, "其他福利最后缴纳月"), "otherEndTime"));
return list;
}
@ -2075,21 +2074,37 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
socialSet.forEach(item -> {
if (socialCollect.containsKey(Long.valueOf(item))) {
socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName()
+ SalaryI18nUtil.getI18nLabel(0, "申报基数")
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数")
+ SalaryI18nUtil.getI18nLabel(0,"个人"));
}
});
socialComSet.forEach(item -> {
if (socialCollect.containsKey(Long.valueOf(item))) {
socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName()
+ SalaryI18nUtil.getI18nLabel(0, "申报基数")
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数")
+ SalaryI18nUtil.getI18nLabel(0,"单位"));
}
});
} else {
// socialSet.forEach(item -> {
// if (socialCollect.containsKey(Long.valueOf(item))) {
// socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数"));
// }
// });
socialSet.forEach(item -> {
if (socialCollect.containsKey(Long.valueOf(item))) {
socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数"));
//获取福利险种名（多语言）
String insuranceName = "";
if(socialCollect.get(Long.valueOf(item)) != null && socialCollect.get(Long.valueOf(item)).getInsuranceName() != null) {
// insuranceName = socialCollect.get(Long.valueOf(item)).getLabelId() != null
// ? SalaryI18nUtil.getI18nLabel(user.getLanguage(),socialCollect.get(Long.valueOf(item)).getLabelId(),socialCollect.get(Long.valueOf(item)).getInsuranceName())
// : socialCollect.get(Long.valueOf(item)).getInsuranceName();
//20231113逻辑变更，对福利险种、薪资项目、薪资项目分组的名称舍弃基于labelId的多语言适配逻辑，直接以多语言命名方式设置name
insuranceName = Util.formatMultiLang(socialCollect.get(Long.valueOf(item)).getInsuranceName(), String.valueOf(user.getLanguage()));
}
socialMap.put(item, insuranceName + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542283, "申报基数"));
// socialMap.put(item, socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542283, "申报基数"));
}
});
}
@ -2104,21 +2119,21 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
fundSet.forEach(item -> {
if (fundCollect.containsKey(Long.valueOf(item))) {
fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName()
+ SalaryI18nUtil.getI18nLabel(0, "申报基数")
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数")
+ SalaryI18nUtil.getI18nLabel(0,"个人"));
}
});
fundComSet.forEach(item -> {
if (fundCollect.containsKey(Long.valueOf(item))) {
fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName()
+ SalaryI18nUtil.getI18nLabel(0, "申报基数")
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数")
+ SalaryI18nUtil.getI18nLabel(0,"单位"));
}
});
} else {
fundSet.forEach(item -> {
if (fundCollect.containsKey(Long.valueOf(item))) {
fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数"));
fundMap.put(item, fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数"));
}
});
}
@ -2134,21 +2149,21 @@ public class SIArchivesServiceImpl extends Service implements SIArchivesService
otherSet.forEach(item -> {
if (otherCollect.containsKey(Long.valueOf(item))) {
otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName()
+ SalaryI18nUtil.getI18nLabel(0, "申报基数")
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数")
+ SalaryI18nUtil.getI18nLabel(0,"个人"));
}
});
otherComSet.forEach(item -> {
if (otherCollect.containsKey(Long.valueOf(item))) {
otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName()
+ SalaryI18nUtil.getI18nLabel(0, "申报基数")
+ SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数")
+ SalaryI18nUtil.getI18nLabel(0,"单位"));
}
});
} else {
otherSet.forEach(item -> {
if (otherCollect.containsKey(Long.valueOf(item))) {
otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数"));
otherMap.put(item, otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数"));
}
});
}

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

@ -229,7 +229,7 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
Map<String, Object> apidatas = new HashMap<String, Object>(16);
Collection<Long> ids = (Collection<Long>)params.get("ids");
if (CollectionUtils.isEmpty(ids)) {
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"参数错误"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),389204,"参数错误"));
}
//校验带上类型
int welfareTypeId = (Integer) params.get("welfareTypeId");
@ -237,28 +237,28 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
// int num = siSchemeBiz.checkBeforeDeleteSocialscheme(params);
int num = checkBeforeDeleteSocialscheme(params);
if (num > 0){
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该社保方案已被使用"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),544124,"该社保方案已被使用"));
}
}
if(WelfareTypeEnum.ACCUMULATION_FUND.getValue() == welfareTypeId){
// int accumulationfundNum = siSchemeBiz.checkBeforeDeleteAccumulationfund(params);
int accumulationfundNum = checkBeforeDeleteAccumulationfund(params);
if (accumulationfundNum > 0){
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该公积金方案已被使用"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),544125,"该公积金方案已被使用"));
}
}
if(WelfareTypeEnum.OTHER.getValue() == welfareTypeId){
// int otherschemeNum = siSchemeBiz.checkBeforeDeleteOtherscheme(params);
int otherschemeNum = checkBeforeDeleteOtherscheme(params);
if (otherschemeNum > 0){
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该其他福利方案已被使用"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),544126,"该其他福利方案已被使用"));
}
}
// int billNum = siSchemeBiz.checkBeforeDeleteBill(params,welfareTypeId);
int billNum = checkBeforeDeleteBill(params,welfareTypeId);
if (billNum > 0){
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(0,"该福利方案已被核算"));
throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),544127,"该福利方案已被核算"));
}
// siSchemeBiz.deleteSocialscheme(params);
deleteSocialscheme(params);
@ -858,12 +858,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
if (welBaseDiffSign) {
socialSet.forEach(item -> {
if (socialCollect.containsKey(Long.valueOf(item))) {
socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人"));
socialMap.put(item + "per", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人"));
}
});
socialComSet.forEach(item -> {
if (socialCollect.containsKey(Long.valueOf(item))) {
socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位"));
socialComMap.put(item + "com", socialCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位"));
}
});
} else {
@ -893,12 +893,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
if (welBaseDiffSign) {
fundSet.forEach(item -> {
if (fundCollect.containsKey(Long.valueOf(item))) {
fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人"));
fundMap.put(item + "per", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人"));
}
});
fundComSet.forEach(item -> {
if (fundCollect.containsKey(Long.valueOf(item))) {
fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位"));
fundComMap.put(item + "com", fundCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位"));
}
});
} else {
@ -928,12 +928,12 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
if (welBaseDiffSign) {
otherSet.forEach(item -> {
if (otherCollect.containsKey(Long.valueOf(item))) {
otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人"));
otherMap.put(item + "per", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"个人"));
}
});
otherComSet.forEach(item -> {
if (otherCollect.containsKey(Long.valueOf(item))) {
otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位"));
otherComMap.put(item + "com", otherCollect.get(Long.valueOf(item)).getInsuranceName() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0,"单位"));
}
});
} else {
@ -1456,8 +1456,8 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
boolean welBaseDiffSign = getSIArchivesService(user).isDiffWelBase();
if (welBaseDiffSign) {
for (Map.Entry<Long, String> entry : welfareMap.entrySet()) {
String keyPerName = entry.getValue() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人");
String keyComName = entry.getValue() + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位");
String keyPerName = entry.getValue() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人");
String keyComName = entry.getValue() + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位");
String numberPerValue = findElement(singleAccount, keyPerName).get(keyPerName) == null ? "" : findElement(singleAccount, keyPerName).get(keyPerName).toString();
String numberComValue = findElement(singleAccount, keyComName).get(keyComName) == null ? "" : findElement(singleAccount, keyComName).get(keyComName).toString();
@ -1649,18 +1649,18 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
continue;
}
if (welBaseDiffSign) {
Map<String, Object> itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
Map<String, Object> itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
if (itemPerMap != null) {
String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
if (StringUtils.isNotBlank(itemValue)) {
socialPaymentBase.put(String.valueOf(insuranceId), itemValue);
} else if (oldSocialBaseMap != null && StringUtils.isNotBlank(oldSocialBaseMap.get(String.valueOf(insuranceId)))) {
socialPaymentBase.put(String.valueOf(insuranceId), oldSocialBaseMap.get(String.valueOf(insuranceId)));
}
}
Map<String, Object> itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
Map<String, Object> itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
if (itemComMap != null) {
String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
if (StringUtils.isNotBlank(itemValue)) {
socialPaymentComBase.put(String.valueOf(insuranceId), itemValue);
} else if (oldSocialComBaseMap != null && StringUtils.isNotBlank(oldSocialComBaseMap.get(String.valueOf(insuranceId)))) {
@ -1865,18 +1865,18 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
continue;
}
if (welBaseDiffSign) {
Map<String, Object> itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
Map<String, Object> itemPerMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
if (itemPerMap != null) {
String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
String itemValue = (String) itemPerMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "个人"));
if (StringUtils.isNotBlank(itemValue)) {
otherPaymentBase.put(String.valueOf(insuranceId), itemValue);
} else if (oldOtherBaseMap != null && StringUtils.isNotBlank(oldOtherBaseMap.get(String.valueOf(insuranceId)))) {
otherPaymentBase.put(String.valueOf(insuranceId), oldOtherBaseMap.get(String.valueOf(insuranceId)));
}
}
Map<String, Object> itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
Map<String, Object> itemComMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
if (itemComMap != null) {
String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
String itemValue = (String) itemComMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数") + SalaryI18nUtil.getI18nLabel(0, "单位"));
if (StringUtils.isNotBlank(itemValue)) {
otherPaymentComBase.put(String.valueOf(insuranceId), itemValue);
} else if (oldOtherComBaseMap != null && StringUtils.isNotBlank(oldOtherComBaseMap.get(String.valueOf(insuranceId)))) {
@ -1885,9 +1885,9 @@ public class SISchemeServiceImpl extends Service implements SISchemeService {
}
insuranceArchivesOtherSchemePO.setOtherPaymentComBaseString(JSON.toJSONString(otherPaymentComBase));
} else {
Map<String, Object> itemMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数"));
Map<String, Object> itemMap = findElement(singleAccount, welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数"));
if (itemMap != null) {
String itemValue = (String) itemMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(0, "申报基数"));
String itemValue = (String) itemMap.get(welfareMap.get(insuranceId) + SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542283, "申报基数"));
if (StringUtils.isNotBlank(itemValue)) {
otherPaymentBase.put(String.valueOf(insuranceId), itemValue);
} else if (oldOtherBaseMap != null && StringUtils.isNotBlank(oldOtherBaseMap.get(String.valueOf(insuranceId)))) {

2
src/com/engine/salary/web/SpecialAddDeductionController.java
View File

@ -106,7 +106,7 @@ public class SpecialAddDeductionController {
SpecialAddDeductionQueryParam param = buildParam(request);
XSSFWorkbook workbook = getSpecialAddDeductionWrapper(user).downloadTemplate(param);
String fileName = "专项附加扣除导入模板" + LocalDate.now();
String fileName = SalaryI18nUtil.getI18nLabel(user.getLanguage(), 542549, "专项附加免税扣除") + LocalDate.now();
try {
fileName = URLEncoder.encode(fileName + ".xlsx", "UTF-8").replaceAll("\\+", "%20");
} catch (UnsupportedEncodingException e) {

6
src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
View File

@ -2,10 +2,9 @@ package com.engine.salary.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryBill.dto.SalaryTemplateSalaryItemListDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO;
import com.engine.salary.entity.salaryarchive.dto.SingleSalaryItemAdjustRecordListDTO;
@ -32,7 +31,6 @@ import com.engine.salary.wrapper.proxy.SalaryArchiveItemWrapperProxy;
import com.google.common.collect.Lists;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.math.NumberUtils;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.BeanUtils;
import weaver.general.Util;
@ -88,7 +86,7 @@ public class SalaryArchiveItemWrapper extends Service implements SalaryArchiveIt
data.put("effectiveTime", effectiveTime == null ? null : effectiveTime + "");
data.put("adjustReason", adjustReason);
data.put("description", description);
data.put("adjustReasonList", SalaryArchiveItemAdjustReasonEnum.getList());
data.put("adjustReasonList", SalaryArchiveItemAdjustReasonEnum.getList(user));
return data;
}

2
src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
View File

@ -526,7 +526,7 @@ public class SalaryArchiveWrapper extends Service {
*/
public Map<String, Object> searchCondition() {
List<Map<String, String>> userStatus = UserStatusEnum.getList();
List<Map<String, String>> itemAdjustReasons = SalaryArchiveItemAdjustReasonEnum.getList();
List<Map<String, String>> itemAdjustReasons = SalaryArchiveItemAdjustReasonEnum.getList(user);
List<Map<String, String>> TaxAgentAdjustReason = SalaryArchiveTaxAgentAdjustReasonEnum.getList();
Collection<TaxAgentListDTO> taxAgentList = getTaxAgentService(user).findAll();
HashMap map = Maps.newHashMap();