diff --git a/resource/国际化sql/20230414100117.zip b/resource/国际化sql/20230414100117.zip new file mode 100644 index 000000000..46c6b229b Binary files /dev/null and b/resource/国际化sql/20230414100117.zip differ diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java index edeb2ed77..cac635df2 100644 --- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java @@ -125,7 +125,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction username.setFieldcol(16); username.setLabelcol(8); username.setViewAttr(2); - username.setLabel("姓名"); + username.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034,"姓名")); conditionItems.add(username); @@ -136,7 +136,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction departmentName.setLabelcol(8); departmentName.setViewAttr(2); departmentName.setIsQuickSearch(false); - departmentName.setLabel("部门"); + departmentName.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门")); conditionItems.add(departmentName); @@ -146,7 +146,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction jobNum.setFieldcol(16); jobNum.setLabelcol(8); jobNum.setViewAttr(2); - jobNum.setLabel("工号"); + jobNum.setLabel(SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号")); conditionItems.add(jobNum); @@ -182,7 +182,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction // mobile.setLabel("手机号"); // conditionItems.add(mobile); - addGroups.add(new SearchConditionGroup("常用条件", true, conditionItems)); + addGroups.add(new SearchConditionGroup(SalaryI18nUtil.getI18nLabel(user.getLanguage(),32905,"常用条件"), true, conditionItems)); apidatas.put("condition", addGroups); return apidatas; @@ -205,7 +205,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction String declareMonthStr = importParam.getDeclareMonth(); //excel文件id String imageId = Util.null2String(importParam.getImageId()); - Validate.notBlank(imageId, "imageId为空"); + Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空")); // 获取所有个税扣缴义务人 Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); //个税扣缴义务人 @@ -256,7 +256,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction int errorSum = 0; //行号 - String rowIndex = String.format("第%s行", i + 2); + String rowIndex = SalaryI18nUtil.getI18nLabel(user.getLanguage(),542129,"错误行") + (i+2) + ":" ; //相同的姓名 String userName = dto.getUsername(); @@ -271,12 +271,12 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //姓名 不能为空 //错误消息对象 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "姓名不能为空"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542130,"姓名不能为空")); errorData.add(errorMessageMap); errorSum += 1; } else if (CollectionUtils.isEmpty(employeeSameIds)) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "员工信息不存在"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在")); errorData.add(errorMessageMap); errorSum += 1; } else if (employeeSameIds.size() > 1) { @@ -286,7 +286,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .collect(Collectors.toList()); if (employeeSameIds.size() != 1) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "员工信息不存在或者存在多个员工"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542132,"员工信息不存在或者存在多个员工")); errorData.add(errorMessageMap); errorSum += 1; } else { @@ -300,7 +300,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } else { //姓名错误,系统内不存在该姓名 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "姓名错误,系统内不存在该姓名"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542133,"姓名错误,系统内不存在该姓名") ); errorData.add(errorMessageMap); errorSum += 1; } @@ -311,7 +311,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (StringUtils.isBlank(taxAgentName)) { //个税扣缴义务人不能为空 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不能为空"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空")); errorData.add(errorMessageMap); errorSum += 1; } else { @@ -320,7 +320,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (StringUtils.isNotEmpty(taxAgentId) && !optionalTemp.get().getTaxAgentId().equals(Long.valueOf(taxAgentId))) { //个税扣缴义务人与导入时选择的不一致 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人与导入时选择的不一致"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542135,"个税扣缴义务人与导入时选择的不一致")); errorData.add(errorMessageMap); errorSum += 1; } else { @@ -330,7 +330,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction } else { //个税扣缴义务人不存在 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); + errorMessageMap.put("message", rowIndex + rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内")); errorData.add(errorMessageMap); errorSum += 1; } @@ -354,7 +354,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId()) && f.getTaxAgentId().equals(addUpDeduction.getTaxAgentId())); if (optionalAcctEmp.isPresent() && isExist) { Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "该年月这条数据已经核算过,不可导入"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542137,"该年月这条数据已经核算过,不可导入")); errorData.add(errorMessageMap); errorSum += 1; } @@ -408,13 +408,13 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); AddUpDeduction byId = addUpDeductionBiz.getById(addUpDeduction.getId()); if (byId == null) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException( SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!") ); } Long taxAgentId = byId.getTaxAgentId(); boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId() , taxAgentId)); if (!canEdit) { //没有编辑权限 - throw new SalaryRunTimeException("该个税扣缴义务人无权限编辑此数据!"); + throw new SalaryRunTimeException( SalaryI18nUtil.getI18nLabel(user.getLanguage(),542139,"该个税扣缴义务人无权限编辑此数据!")); } // 已经核算过的不可操作 @@ -424,7 +424,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) { Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId()) && f.getTaxAgentId().equals(addUpDeduction.getTaxAgentId())).findFirst(); if (optionalAcctEmp.isPresent()) { - throw new SalaryRunTimeException("该年月这条数据已经核算过,不可进行编辑!"); + throw new SalaryRunTimeException( SalaryI18nUtil.getI18nLabel(user.getLanguage(),542140,"该年月这条数据已经核算过,不可进行编辑!") ); } } ArrayList updateList = new ArrayList<>(); @@ -443,7 +443,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction //税款所属期 String declareMonthStr = addUpDeductionRecordParam.getDeclareMonth(); if (declareMonthStr .equals("")) { - throw new SalaryRunTimeException("税款所属期不能为空!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542141,"税款所属期不能为空!") ); } // 获取所有个税扣缴义务人 Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); @@ -472,14 +472,14 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .declareMonth(declareMonth).build(); boolean employeeSameId = employees.stream().anyMatch(e -> Objects.equals(e.getEmployeeId() , addUpDeductionRecordParam.getEmployeeId())); if (!employeeSameId) { - throw new SalaryRunTimeException("员工信息不存在"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在")); } addUpDeduction.setEmployeeId(addUpDeductionRecordParam.getEmployeeId()); String taxAgentName = addUpDeductionRecordParam.getTaxAgentName(); if (StringUtils.isBlank(taxAgentName)) { //个税扣缴义务人不能为空 - throw new SalaryRunTimeException("个税扣缴义务人不能为空"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542134,"个税扣缴义务人不能为空")); } else { Optional optionalTemp = taxAgentList.stream().filter(m -> m.getTaxAgentName().equals(taxAgentName)).findFirst(); if (optionalTemp.isPresent()) { @@ -487,7 +487,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction taxAgentEmployees = optionalTemp.get().getEmployeeList(); } else { //个税扣缴义务人不存在或不在权限范围内 - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException( SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内")); } } @@ -507,7 +507,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId()) && f.getTaxAgentId().equals(addUpDeduction.getTaxAgentId())).findFirst(); boolean isExist = list.stream().anyMatch(f -> f.getEmployeeId().equals(addUpDeduction.getEmployeeId()) && f.getTaxAgentId().equals(addUpDeduction.getTaxAgentId())); if (optionalAcctEmp.isPresent() && isExist) { - throw new SalaryRunTimeException("该年月这条数据已经核算过,不可导入"); + throw new SalaryRunTimeException( SalaryI18nUtil.getI18nLabel(user.getLanguage(),542137,"该年月这条数据已经核算过,不可导入") ); } } @@ -551,18 +551,18 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Long id = deleteIds.get(i); AddUpDeduction byId = addUpDeductionBiz.getById(id); if (byId == null) { - throw new SalaryRunTimeException("数据不存在或已被删除!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542142,"数据不存在或已被删除!")); } // 判断是否在个税扣缴义务人范围内 Optional first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId() , byId.getTaxAgentId())).findFirst(); if (!first.isPresent()) { - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } // 判断用户是否存在 if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) { Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(byId.getEmployeeId()) && f.getTaxAgentId().equals(byId.getTaxAgentId())).findFirst(); if (optionalAcctEmp.isPresent()) { - throw new SalaryRunTimeException("所选数据在该年月中已完成核算并归档,不可进行删除!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542143,"所选数据在该年月中已完成核算并归档,不可进行删除!")); } } deleteList.add(byId.getId()); @@ -583,7 +583,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction try { declareMonthDate.add(sdf.parse(declareMonthStr + "-01")); } catch (Exception e) { - throw new SalaryRunTimeException("日期异常"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542144,"日期异常")); } AddUpDeductionQueryParam queryParam = null; if (deleteParam.getTaxAgentId() != null && (!deleteParam.getTaxAgentId().equals(""))) { @@ -591,7 +591,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Long taxAgentId = SalaryEntityUtil.string2Long(deleteParam.getTaxAgentId()); boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t , taxAgentId)); if (!canDelete) { - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } ArrayList tai = new ArrayList<>(); tai.add(taxAgentId); @@ -607,7 +607,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) { Optional optionalAcctEmp = salaryAcctEmployees.stream().filter(f -> f.getEmployeeId().equals(item.getEmployeeId()) && f.getTaxAgentId().equals(item.getTaxAgentId())).findFirst(); if (optionalAcctEmp.isPresent()) { - throw new SalaryRunTimeException("员工:" + item.getUsername() + ",在该年月中已完成核算并归档,不能进行一键清空!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),362,"员工") + ":" + item.getUsername() + "," + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542145,"在该年月中已完成核算并归档,不能进行一键清空!")); } } } @@ -626,11 +626,11 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction AddUpDeductionQueryParam build = AddUpDeductionQueryParam.builder().ids(ids).build(); List addUpDeductionRecordDTOS = new AddUpDeductionBiz().recordList(build); if (addUpDeductionRecordDTOS == null || addUpDeductionRecordDTOS.size() == 0) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } String taxAgentName = addUpDeductionRecordDTOS.get(0).getTaxAgentName(); if (!taxAgentNames.contains(taxAgentName)) { - throw new SalaryRunTimeException("您无权查看该数据!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542146,"您无权查看该数据!")); } return addUpDeductionRecordDTOS.get(0); } @@ -657,7 +657,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction taxAgents.stream().map(TaxAgentPO::getId).collect(Collectors.toList()) ); if (countByDeclareAfter > 0) { - throw new SalaryRunTimeException("无法累计,请检查当前累计年度内该月后是否有累计专项附加扣除记录!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542151,"无法累计,请检查当前累计年度内该月后是否有累计专项附加扣除记录!")); } List updateList = new ArrayList<>(); List insertList = new ArrayList<>(); @@ -733,9 +733,11 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction .stream() .map(DataCollectionEmployee::getUsername) .collect(Collectors.joining(",")); - return "一键累计完成!员工" + userNames + "在该年月已核算归档,跳过本次累计"; + return SalaryI18nUtil.getI18nLabel(user.getLanguage(),542152,"一键累计完成!") + + SalaryI18nUtil.getI18nLabel(user.getLanguage(),362,"员工") + + userNames + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542153,"在该年月已核算归档,跳过本次累计") ; } - return "一键累计完成!"; + return SalaryI18nUtil.getI18nLabel(user.getLanguage(),542152,"一键累计完成!"); } /** @@ -808,7 +810,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Map apidatas = new HashMap(); //excel文件id String imageId = Util.null2String(importParam.getImageId()); - Validate.notBlank(imageId, "imageId为空"); + Validate.notBlank(imageId, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542127,"imageId为空")); InputStream fileInputStream = null; try { @@ -891,17 +893,17 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Long id = queryParam.getAccumulatedSpecialAdditionalDeductionId(); if (id == null) { - throw new SalaryRunTimeException("id不能为空"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),390521,"id不能为空")); } AddUpDeduction po = biz.getById(id); if (po == null) { - throw new SalaryRunTimeException(String.format("累计专项附加扣除不存在" + "[id:%s]", id)); + throw new SalaryRunTimeException(String.format(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542155,"累计专项附加扣除不存在") + "[id:%s]", id)); } List employeeList = employBiz.getEmployeeByIds(Collections.singletonList(po.getEmployeeId())); if (CollectionUtils.isEmpty(employeeList)) { - throw new SalaryRunTimeException("员工信息不存在"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542131,"员工信息不存在")); } //查询参数 @@ -918,7 +920,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction List> rowList = getExcelRowDetailList(isChief, queryParam); //获取excel - return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除明细"); + return ExcelUtil.genWorkbook(rowList, SalaryI18nUtil.getI18nLabel(user.getLanguage(),542156,"累计专项附加扣除明细")); } @@ -932,7 +934,18 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction long employeeId = user.getUID(); //excel标题 - List title = Arrays.asList("姓名", "申报月份", "个税扣缴义务人", "部门", "工号", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护"); + List title = Arrays.asList(SalaryI18nUtil.getI18nLabel(user.getLanguage(),25034,"姓名"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542157,"申报月份"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),537996,"个税扣缴义务人"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),27511,"部门"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),1933,"工号"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542158,"累计子女教育"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542159,"累计继续教育"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542160,"累计住房贷款利息"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542161,"累计住房租金"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542162,"累计赡养老人"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542163,"累计大病医疗"), + SalaryI18nUtil.getI18nLabel(user.getLanguage(),537990,"累计婴幼儿照护")); SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM"); @@ -994,20 +1007,20 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction String sheetName = SalaryI18nUtil.getI18nLabel(101603, "累计专项附加扣除导入模板"); String[] header = { - SalaryI18nUtil.getI18nLabel(85429, "姓名"), - SalaryI18nUtil.getI18nLabel(86184, "个税扣缴义务人"), - SalaryI18nUtil.getI18nLabel(86185, "部门"), - SalaryI18nUtil.getI18nLabel(86186, "手机号"), - SalaryI18nUtil.getI18nLabel(86317, "工号"), - SalaryI18nUtil.getI18nLabel(86318, "证件号码"), - SalaryI18nUtil.getI18nLabel(86319, "入职日期"), - SalaryI18nUtil.getI18nLabel(86321, "累计子女教育"), - SalaryI18nUtil.getI18nLabel(86323, "累计继续教育"), - SalaryI18nUtil.getI18nLabel(86324, "累计住房贷款利息"), - SalaryI18nUtil.getI18nLabel(86325, "累计住房租金"), - SalaryI18nUtil.getI18nLabel(86326, "累计赡养老人"), - SalaryI18nUtil.getI18nLabel(105142, "累计大病医疗"), - SalaryI18nUtil.getI18nLabel(105142, "累计婴幼儿照护") + SalaryI18nUtil.getI18nLabel(25034, "姓名"), + SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), + SalaryI18nUtil.getI18nLabel(27511, "部门"), + SalaryI18nUtil.getI18nLabel(125238, "手机号"), + SalaryI18nUtil.getI18nLabel(1933, "工号"), + SalaryI18nUtil.getI18nLabel(1839, "证件号码"), + SalaryI18nUtil.getI18nLabel(1516, "入职日期"), + SalaryI18nUtil.getI18nLabel(542158, "累计子女教育"), + SalaryI18nUtil.getI18nLabel(542159, "累计继续教育"), + SalaryI18nUtil.getI18nLabel(542160, "累计住房贷款利息"), + SalaryI18nUtil.getI18nLabel(542161, "累计住房租金"), + SalaryI18nUtil.getI18nLabel(542162, "累计赡养老人"), + SalaryI18nUtil.getI18nLabel(542163, "累计大病医疗"), + SalaryI18nUtil.getI18nLabel(537990, "累计婴幼儿照护") }; List dataIndexList = Lists.newArrayList("username", "taxAgentName", "departmentName", "mobile", "workcode", "idNo", "hiredate", "billMonth", "supplementaryMonth"); @@ -1030,15 +1043,15 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction // 4.注释 List excelComments = Lists.newArrayList(); - excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(100344, "必填"))); - excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(100344, "必填"))); - excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - excelComments.add(new ExcelComment(9, 0, 12, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - excelComments.add(new ExcelComment(10, 0, 13, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - excelComments.add(new ExcelComment(11, 0, 14, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - excelComments.add(new ExcelComment(12, 0, 15, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); - excelComments.add(new ExcelComment(13, 0, 16, 2, SalaryI18nUtil.getI18nLabel(100344, "输入数字"))); + excelComments.add(new ExcelComment(0, 0, 3, 2, SalaryI18nUtil.getI18nLabel(30036, "必填"))); + excelComments.add(new ExcelComment(1, 0, 4, 2, SalaryI18nUtil.getI18nLabel(30036, "必填"))); + excelComments.add(new ExcelComment(7, 0, 10, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); + excelComments.add(new ExcelComment(8, 0, 11, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); + excelComments.add(new ExcelComment(9, 0, 12, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); + excelComments.add(new ExcelComment(10, 0, 13, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); + excelComments.add(new ExcelComment(11, 0, 14, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); + excelComments.add(new ExcelComment(12, 0, 15, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); + excelComments.add(new ExcelComment(13, 0, 16, 2, SalaryI18nUtil.getI18nLabel(542164, "输入数字"))); XSSFWorkbook book = ExcelUtil.genWorkbookV2(rows, sheetName, excelComments); @@ -1087,7 +1100,7 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction List> rowList = getExcelRowList(isChief, queryParam); //获取excel - return ExcelUtil.genWorkbook(rowList, "累计专项附加扣除"); + return ExcelUtil.genWorkbook(rowList, SalaryI18nUtil.getI18nLabel(538006, "累计专项附加扣除")); } @@ -1100,7 +1113,21 @@ public class AddUpDeductionServiceImpl extends Service implements AddUpDeduction Long employeeId = (long) user.getUID(); //excel标题 - List title = Arrays.asList("姓名", "个税扣缴义务人", "部门", "手机号", "工号", "证件号码", "入职日期", "累计子女教育", "累计继续教育", "累计住房贷款利息", "累计住房租金", "累计赡养老人", "累计大病医疗", "累计婴幼儿照护"); + List title = Arrays.asList( + SalaryI18nUtil.getI18nLabel(25034, "姓名"), + SalaryI18nUtil.getI18nLabel(537996, "个税扣缴义务人"), + SalaryI18nUtil.getI18nLabel(27511, "部门"), + SalaryI18nUtil.getI18nLabel(125238, "手机号"), + SalaryI18nUtil.getI18nLabel(1933, "工号"), + SalaryI18nUtil.getI18nLabel(1839, "证件号码"), + SalaryI18nUtil.getI18nLabel(1516, "入职日期"), + SalaryI18nUtil.getI18nLabel(542158, "累计子女教育"), + SalaryI18nUtil.getI18nLabel(542159, "累计继续教育"), + SalaryI18nUtil.getI18nLabel(542160, "累计住房贷款利息"), + SalaryI18nUtil.getI18nLabel(542161, "累计住房租金"), + SalaryI18nUtil.getI18nLabel(542162, "累计赡养老人"), + SalaryI18nUtil.getI18nLabel(542163, "累计大病医疗"), + SalaryI18nUtil.getI18nLabel(537990, "累计婴幼儿照护")); //排序配置 diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java index c57f146fd..01de33cdd 100644 --- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java +++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java @@ -725,7 +725,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation } else { //个税扣缴义务人不存在 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); errorData.add(errorMessageMap); errorSum += 1; } @@ -860,7 +860,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); AddUpSituation byId = biz.getById(addUpSituationParam.getId()); if(byId == null){ - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } Long taxAgentId = byId.getTaxAgentId(); boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId() , taxAgentId)); @@ -963,7 +963,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation taxAgentEmployees = optionalTemp.get().getEmployeeList(); } else { //个税扣缴义务人不存在 - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } } @@ -1064,7 +1064,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation // 判断是否在个税扣缴义务人范围内 Optional first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId() , byId.getTaxAgentId())).findFirst(); if(!first.isPresent()){ - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } // 判断用户是否存在 if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) { @@ -1100,7 +1100,7 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation Long taxAgentId = SalaryEntityUtil.string2Long(deleteParam.getTaxAgentId()); boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t , taxAgentId)); if(!canDelete){ - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } ArrayList tai = new ArrayList<>(); tai.add(taxAgentId); @@ -1138,11 +1138,11 @@ public class AddUpSituationServiceImpl extends Service implements AddUpSituation AddUpSituationQueryParam build = AddUpSituationQueryParam.builder().ids(ids).build(); List list = biz.recordList(build); if(list == null || list.size()==0){ - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } String taxAgentName = list.get(0).getTaxAgentName(); if(!taxAgentNames.contains(taxAgentName)){ - throw new SalaryRunTimeException("您无权查看该数据!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542146,"您无权查看该数据!")); } return list.get(0); } diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java index fd91d82b6..c22b7d55d 100644 --- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java +++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java @@ -801,7 +801,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa AttendQuoteDataQueryParam build = AttendQuoteDataQueryParam.builder().ids(ids).build(); List list = dataBiz.list(build); if (list == null || list.size() == 0) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } Map attendQuoteFieldData = new HashMap<>(); for (Map.Entry entrySet : attendQuoteData.entrySet()) { @@ -827,7 +827,7 @@ public class AttendQuoteDataServiceImpl extends Service implements AttendQuoteDa AttendQuoteDataQueryParam build = AttendQuoteDataQueryParam.builder().ids(ids).build(); List list = dataBiz.list(build); if (list == null || list.size() == 0) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } // 所有考勤字段 List attendQuoteFields = getAllAttendQuoteFields(); diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java index eb8ea02ba..13f9df72f 100644 --- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java @@ -312,7 +312,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction } else { //个税扣缴义务人不存在 Map errorMessageMap = Maps.newHashMap(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); errorData.add(errorMessageMap); errorSum += 1; } @@ -567,7 +567,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction Collection taxAgentList = getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); OtherDeductionPO byId = OtherDeductionBiz.getById(otherDeductionParam.getId()); if (byId == null) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } Long taxAgentId = byId.getTaxAgentId(); boolean canEdit = taxAgentList.stream().anyMatch(t -> Objects.equals(t.getTaxAgentId(), taxAgentId)); @@ -648,7 +648,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction taxAgentEmployees = optionalTemp.get().getEmployeeList(); } else { //个税扣缴义务人不存在或不在权限范围内 - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } } @@ -705,7 +705,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction // 判断是否在个税扣缴义务人范围内 Optional first = taxAgentList.stream().filter(m -> Objects.equals(m.getTaxAgentId(), byId.getTaxAgentId())).findFirst(); if (!first.isPresent()) { - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } // 判断用户是否存在 if (CollectionUtils.isNotEmpty(salaryAcctEmployees)) { @@ -741,7 +741,7 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction Long taxAgentId = SalaryEntityUtil.string2Long(deleteParam.getTaxAgentId()); boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t, taxAgentId)); if (!canDelete) { - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } ArrayList tai = new ArrayList<>(); tai.add(taxAgentId); @@ -778,11 +778,11 @@ public class OtherDeductionServiceImpl extends Service implements OtherDeduction encryptUtil.decryptList(list, OtherDeductionRecordDTO.class); if (list == null || list.size() == 0) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } String taxAgentName = list.get(0).getTaxAgentName(); if (!taxAgentNames.contains(taxAgentName)) { - throw new SalaryRunTimeException("您无权查看该数据!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542146,"您无权查看该数据!")); } return list.get(0); } diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java index 18ea0cf0c..a8663ce0e 100644 --- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java +++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java @@ -304,7 +304,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd } else { //个税扣缴义务人不存在 Map errorMessageMap = new HashMap<>(); - errorMessageMap.put("message", rowIndex + "个税扣缴义务人不存在或不在权限范围内"); + errorMessageMap.put("message", rowIndex + SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); errorData.add(errorMessageMap); errorSum += 1; } @@ -490,7 +490,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd getTaxAgentService(user).listTaxAgentAndEmployeeTree(currentEmployeeId); SpecialAddDeductionPO byId = SpecialAddDeductionBiz.getById(specialAddDeductionParam.getId()); if (byId == null) { - throw new SalaryRunTimeException("该数据不存在!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542138,"该数据不存在!")); } //管理员可以编辑该扣缴义务人数据,其他人可以编辑本人数据 boolean canEdit = byId.getEmployeeId().equals((long) user.getUID()) @@ -558,7 +558,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd po.setTaxAgentId(optionalTemp.get().getTaxAgentId()); } else { //个税扣缴义务人不存在或不在权限范围内 - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } } //数据填充 @@ -594,7 +594,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd taxAgentList.stream() .noneMatch(m -> Objects.equals(m.getTaxAgentId(), byId.getTaxAgentId())); if (isNotInRegion) { - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } deleteList.add(byId.getId()); } @@ -616,7 +616,7 @@ public class SpecialAddDeductionServiceImpl extends Service implements SpecialAd Long taxAgentId = SalaryEntityUtil.string2Long(deleteParam.getTaxAgentId()); boolean canDelete = taxAgentIds.stream().anyMatch(t -> Objects.equals(t, taxAgentId)); if (!canDelete) { - throw new SalaryRunTimeException("个税扣缴义务人不存在或不在权限范围内!"); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } ArrayList tai = new ArrayList<>(); tai.add(taxAgentId); diff --git a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java index b70fb2a91..17db62993 100644 --- a/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentManageRangeServiceImpl.java @@ -694,7 +694,7 @@ public class TaxAgentManageRangeServiceImpl extends Service implements TaxAgentM if (Objects.isNull(taxAgent)) { //个税扣缴义务人不存在 Map errorMessageMap = new HashMap<>(); - errorMessageMap.put("message", "个税扣缴义务人不存在或不在权限范围内"); + errorMessageMap.put("message", SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); errorData.add(errorMessageMap); errorSum += 1; } diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java index 7addd6ac8..b139feb29 100644 --- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java +++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java @@ -343,7 +343,7 @@ public class TaxAgentServiceImpl extends Service implements TaxAgentService { TaxAgentPO taxAgent = getById(saveParam.getId()); if (taxAgent == null) { - throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(100545, "个税扣缴义务人不存在或不在权限范围内")); + throw new SalaryRunTimeException(SalaryI18nUtil.getI18nLabel(user.getLanguage(),542136,"个税扣缴义务人不存在或不在权限范围内!")); } // 是否开启分权 boolean isOpenDevolution = getTaxAgentBaseService(user).isOpenDevolution();