From a5ffe12509e26962e428f236b3220a596c0c1e7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Wed, 13 Dec 2023 19:34:10 +0800 Subject: [PATCH] =?UTF-8?q?=E8=BA=AB=E4=BB=BD=E8=AF=81=E6=9C=80=E5=90=8E?= =?UTF-8?q?=E4=B8=80=E4=BD=8Dx=E8=BD=AC=E5=A4=A7=E5=86=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bo/EmployeeDeclareRefresh.java | 2 +- .../impl/EmployeeDeclareExcelServiceImpl.java | 40 +++++++++---------- .../impl/EmployeeDeclareServiceImpl.java | 2 +- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java index 3ef2357b2..f3223479e 100644 --- a/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java +++ b/src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java @@ -105,7 +105,7 @@ public class EmployeeDeclareRefresh { } EmployeeDeclarePO employeeDeclare = initEmployeeDeclare(dto.getTaxAgentId(), dto.getTaxCycle(), now, employeeId); DataCollectionEmployee simpleUserInfo = simpleUserInfoMap.get(hrmEmployeeComInfo.getEmployeeId()); - String idNum = simpleUserInfo == null ? "" : simpleUserInfo.getIdNo(); + String idNum = simpleUserInfo != null && simpleUserInfo.getIdNo() != null ? simpleUserInfo.getIdNo().toUpperCase() : ""; employeeDeclare.setEmployeeId(hrmEmployeeComInfo.getEmployeeId()); employeeDeclare.setEmployeeType(EmployeeTypeEnum.ORGANIZATION.getValue()); employeeDeclare.setEmployeeName(hrmEmployeeComInfo.getUsername()); diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java index 15afa6d35..783e15511 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java @@ -63,8 +63,8 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee if (StringUtils.equalsIgnoreCase(importParam.getExportData(), "true")) { employeeDeclares = getEmployeeDeclareService(user).listByParam(importParam); } - String yesI18 = SalaryI18nUtil.getI18nLabel(84967, "是"); - String noI18 = SalaryI18nUtil.getI18nLabel(84968, "否"); + String yesI18 = SalaryI18nUtil.getI18nLabel(111111, "是"); + String noI18 = SalaryI18nUtil.getI18nLabel(111111, "否"); List> rows = Lists.newArrayList(); for (EmployeeDeclarePO employeeDeclare : employeeDeclares) { EmploymentStatusEnum employmentStatusEnum = SalaryEnumUtil.enumMatchByValue(employeeDeclare.getEmploymentStatus(), EmploymentStatusEnum.class); @@ -90,7 +90,7 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee } // 组装excel导出数据 ExcelSheetData excelSheetData = new ExcelSheetData(); - excelSheetData.setSheetName(SalaryI18nUtil.getI18nLabel(156425, "人员信息采集")); + excelSheetData.setSheetName(SalaryI18nUtil.getI18nLabel(111111, "人员信息采集")); excelSheetData.setHeaders(getImportHeader()); excelSheetData.setRows(rows); return ExcelUtil.genWorkbook(excelSheetData); @@ -594,22 +594,22 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee private List getImportHeader() { List headers = new ArrayList<>(); - headers.add(SalaryI18nUtil.getI18nLabel(86317, "工号")); - headers.add(SalaryI18nUtil.getI18nLabel(85429, "姓名")); - headers.add(SalaryI18nUtil.getI18nLabel(105139, "证件类型")); - headers.add(SalaryI18nUtil.getI18nLabel(86318, "证件号码")); - headers.add(SalaryI18nUtil.getI18nLabel(156394, "人员状态")); - headers.add(SalaryI18nUtil.getI18nLabel(156396, "任职受雇从业类型")); - headers.add(SalaryI18nUtil.getI18nLabel(187374, "入职年度就业情形")); - headers.add(SalaryI18nUtil.getI18nLabel(98621, "手机号码")); - headers.add(SalaryI18nUtil.getI18nLabel(156409, "任职受雇从业日期")); - headers.add(SalaryI18nUtil.getI18nLabel(95228, "离职日期")); - headers.add(SalaryI18nUtil.getI18nLabel(156399, "是否残疾")); - headers.add(SalaryI18nUtil.getI18nLabel(156412, "残疾证号")); - headers.add(SalaryI18nUtil.getI18nLabel(187385, "是否烈属")); - headers.add(SalaryI18nUtil.getI18nLabel(156413, "烈属证号")); - headers.add(SalaryI18nUtil.getI18nLabel(156400, "是否孤老")); - headers.add(SalaryI18nUtil.getI18nLabel(156402, "是否扣除减除费用")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "工号")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "姓名")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "证件类型")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "证件号码")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "人员状态")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "任职受雇从业类型")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "入职年度就业情形")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "手机号码")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "任职受雇从业日期")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "离职日期")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "是否残疾")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "残疾证号")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "是否烈属")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "烈属证号")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "是否孤老")); + headers.add(SalaryI18nUtil.getI18nLabel(111111, "是否扣除减除费用")); return headers; @@ -629,7 +629,7 @@ public class EmployeeDeclareExcelServiceImpl extends Service implements Employee .collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(lackHeaders)) { // 发送导入回调信息 - return SalaryI18nUtil.getI18nLabel(101850, "缺少如下列，请检查：") + Joiner.on(",").join((Iterable) lackHeaders); + return SalaryI18nUtil.getI18nLabel(111111, "缺少如下列，请检查：") + Joiner.on(",").join((Iterable) lackHeaders); } return null; } diff --git a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java index 32bf9a06b..5559e5214 100644 --- a/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java +++ b/src/com/engine/salary/service/impl/EmployeeDeclareServiceImpl.java @@ -193,7 +193,7 @@ public class EmployeeDeclareServiceImpl extends Service implements EmployeeDecla employeeDeclare.setEmployeeName(saveParam.getEmployeeName()); employeeDeclare.setJobNum(saveParam.getJobNum()); employeeDeclare.setCardType(CardTypeEnum.RESIDENT_IDENTITY_CARDS.getValue()); - employeeDeclare.setCardNum(saveParam.getCardNum()); + employeeDeclare.setCardNum(saveParam.getCardNum().toUpperCase()); employeeDeclare.setGender(SalaryCardUtil.judgeGender(saveParam.getCardNum()).getValue()); employeeDeclare.setBirthday(SalaryDateUtil.localDateToDate(SalaryCardUtil.judgeBirthday(saveParam.getCardNum()))); employeeDeclare.setEmploymentStatus(saveParam.getEmploymentStatus().getValue());