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

身份证最后一位x转大写

This commit is contained in:
钱涛 2023-12-13 19:34:10 +08:00
parent fa30083d07
commit a5ffe12509
3 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/engine/salary/entity/employeedeclare/bo/EmployeeDeclareRefresh.java
View File

@ -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());

40
src/com/engine/salary/service/impl/EmployeeDeclareExcelServiceImpl.java
View File

@ -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<List<Object>> 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<Object> getImportHeader() {
List<Object> 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;
}

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

@ -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());