Commit 578df4b1 authored by hongguangwu's avatar hongguangwu

MVP1.7.15-学历

parent 5530b3fd
......@@ -136,4 +136,13 @@ public class TDispatchReduceVo extends RowIndex implements Serializable {
@Schema(description = "是否同步终止合同、减项、减档", name = "changeContractAndEmployee")
@ExcelProperty("是否同步终止合同、减项、减档" )
private String changeContractAndEmployee;
/**
* 学历名称
*/
@ExcelAttribute(name = "学历",isNotEmpty = false)
@Schema(description = "学历:派减只做记录" )
@HeadFontStyle(fontHeightInPoints = 11)
@ExcelProperty(value ="学历")
private String educationName;
}
......@@ -2577,7 +2577,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
excel.setEmpRegisType(empVo.getEmpRegisType());
}
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation(excel, empVo);
initEducation(excel, null, empVo);
if (Common.isEmpty(excel.getPost())) {
excel.setPost(empVo.getPost());
}
......@@ -2729,40 +2729,46 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return false;
}
private void initEducation(TDispatchImportVo excel, DispatchEmpVo empVo) {
private void initEducation(TDispatchImportVo excel, TDispatchReduceVo excelReduce, DispatchEmpVo empVo) {
if (Common.isNotNull(empVo.getHignEducation())) {
String educationName = null;
if (empVo.getHignEducation().equals("1")) {
excel.setEducationName("文盲");
educationName= "文盲";
}
if (empVo.getHignEducation().equals("2")) {
excel.setEducationName("小学");
educationName= "小学";
}
if (empVo.getHignEducation().equals("3")) {
excel.setEducationName("初中");
educationName= "初中";
}
if (empVo.getHignEducation().equals("4")) {
excel.setEducationName("高中");
educationName= "高中";
}
if (empVo.getHignEducation().equals("5")) {
excel.setEducationName("大专");
educationName= "大专";
}
if (empVo.getHignEducation().equals("6")) {
excel.setEducationName("本科");
educationName= "本科";
}
if (empVo.getHignEducation().equals("7")) {
excel.setEducationName("硕士");
educationName= "硕士";
}
if (empVo.getHignEducation().equals("8")) {
excel.setEducationName("博士");
educationName= "博士";
}
if (empVo.getHignEducation().equals("9")) {
excel.setEducationName("技工");
educationName= "技工";
}
if (empVo.getHignEducation().equals("10")) {
excel.setEducationName("职高");
educationName= "职高";
}
if (empVo.getHignEducation().equals("11")) {
excel.setEducationName("中专");
educationName= "中专";
}
if (excel != null) {
excel.setEducationName(educationName);
} else if (excelReduce != null) {
excelReduce.setEducationName(educationName);
}
}
}
......@@ -3192,6 +3198,9 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
excelVOTemp.put(excel.getRowIndex().toString(), excel.getEmpIdcard());
// 初始化派单 和 社保公积金查询信息
dispatch = getDispatchInfo(empVo, excel, socialFund, setInfoVo, user);
//派单学历无值时,如果档案有值直接取值档案 2024-08-21 fxj
initEducation(null, excel, empVo);
if (Common.isEmpty(dispatch.getDispatchItem())) {
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_ITEM_EMPTY_EXISTS)));
continue;
......@@ -3251,6 +3260,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
dispatch.setCreateName(user.getNickname());
dispatch.setOrganName(user.getDeptName());
}
dispatch.setEducationName(excel.getEducationName());
dispatch.setChangeContractAndEmployee(excel.getChangeContractAndEmployee());
dispatch.setCreateTime(LocalDateTime.now());
dispatch.setEmpId(socialFund.getEmpId());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment