From 20ebdd33da2444b6bb24a91ff5920736cec0163b Mon Sep 17 00:00:00 2001 From: Harryxzy Date: Fri, 14 Apr 2023 10:02:29 +0800 Subject: [PATCH] =?UTF-8?q?AddUpDeductionServiceImpl=20=E5=A4=9A=E8=AF=AD?= =?UTF-8?q?=E8=A8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resource/国际化sql/20230414100117.zip | Bin 0 -> 20370 bytes .../impl/AddUpDeductionServiceImpl.java | 155 ++++++++++-------- .../impl/AddUpSituationServiceImpl.java | 14 +- .../impl/AttendQuoteDataServiceImpl.java | 4 +- .../impl/OtherDeductionServiceImpl.java | 14 +- .../impl/SpecialAddDeductionServiceImpl.java | 10 +- .../impl/TaxAgentManageRangeServiceImpl.java | 2 +- .../service/impl/TaxAgentServiceImpl.java | 2 +- 8 files changed, 114 insertions(+), 87 deletions(-) create mode 100644 resource/国际化sql/20230414100117.zip diff --git a/resource/国际化sql/20230414100117.zip b/resource/国际化sql/20230414100117.zip new file mode 100644 index 0000000000000000000000000000000000000000..46c6b229bb5e8c2b4c6ce1480d18deac8b18cd79 GIT binary patch literal 20370 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 z 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 literal 0 HcmV?d00001 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();