Commit 14ede6b2 authored by chenyuxi's avatar chenyuxi

feat: 不良记录职业资格接口

parent 5167d5f1
...@@ -187,10 +187,10 @@ public class PreUploadEmpImportTwoVo implements Serializable { ...@@ -187,10 +187,10 @@ public class PreUploadEmpImportTwoVo implements Serializable {
@ExcelAttribute(name = "身份证截止日期-值") @ExcelAttribute(name = "身份证截止日期-值")
private Date validityEndValue; private Date validityEndValue;
@ExcelAttribute(name = "是否有职业资格证书", isDataId = true, readConverterExp = "0=否,1=是") @ExcelAttribute(name = "是否有职业资格证书", isDataId = true, readConverterExp = "0=是,1=否")
private String badRecordFlag; private String badRecordFlag;
@ExcelAttribute(name = "是否有不良记录", isDataId = true, readConverterExp = "0=否,1=是") @ExcelAttribute(name = "是否有不良记录", isDataId = true, readConverterExp = "0=是,1=否")
private String haveQualification; private String haveQualification;
// 字典值结束 // 字典值结束
......
...@@ -3769,7 +3769,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -3769,7 +3769,11 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
// 1.9.6: 是否有职业资格证书 // 1.9.6: 是否有职业资格证书
if (Common.isNotNull(excel.getHaveQualification())) { if (Common.isNotNull(excel.getHaveQualification())) {
saveEmp.setHaveQualification(excel.getHaveQualification()); String flag = CommonConstants.ZERO_STRING;
if("否".equals(excel.getHaveQualification())){
flag = CommonConstants.ONE_STRING;
}
saveEmp.setHaveQualification(flag);
} }
// 更新时,不需要更新其余信息 // 更新时,不需要更新其余信息
...@@ -3817,19 +3821,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -3817,19 +3821,24 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} }
// 1.9.6 存不良记录 // 1.9.6 存不良记录
if (Common.isNotNull(excel.getBadRecordFlag()) if (Common.isNotNull(excel.getBadRecordFlag())
&& (CommonConstants.ONE_STRING.equals(excel.getBadRecordFlag()) && ("是".equals(excel.getBadRecordFlag()) || "否".equals(excel.getBadRecordFlag()))
|| CommonConstants.ZERO_STRING.equals(excel.getBadRecordFlag()))) { ) {
String badFlag = CommonConstants.ZERO_STRING;
if("否".equals(excel.getHaveQualification())){
badFlag = CommonConstants.ONE_STRING;
}
badRecord = new TEmpBadRecord(); badRecord = new TEmpBadRecord();
badRecord.setBadRecordFlag(badFlag);
badRecord.setEmpName(saveEmp.getEmpName());
badRecord.setEmpId(saveEmp.getId());
badRecord.setEmpIdcard(saveEmp.getEmpIdcard()); badRecord.setEmpIdcard(saveEmp.getEmpIdcard());
badRecord.setCreateBy(user.getId()); badRecord.setCreateBy(user.getId());
badRecord.setCreateName(user.getNickname()); badRecord.setCreateName(user.getNickname());
badRecord.setCreateTime(LocalDateTime.now()); badRecord.setCreateTime(LocalDateTime.now());
if(CommonConstants.ONE_STRING.equals(excel.getBadRecordFlag())){ if("否".equals(excel.getBadRecordFlag())){
badRecord.setRemark("未曾经或正在追究与承担过刑事责任"); badRecord.setRemark("未曾经或正在追究与承担过刑事责任");
badRecord.setBadRecordFlag(CommonConstants.ONE_STRING);
} else { } else {
badRecord.setRemark("曾经或正在追究与承担过刑事责任"); badRecord.setRemark("曾经或正在追究与承担过刑事责任");
badRecord.setBadRecordFlag(CommonConstants.ZERO_STRING);
badRecord.setProject(dept.getDepartName()); badRecord.setProject(dept.getDepartName());
badRecord.setProjectCode(dept.getDepartNo()); badRecord.setProjectCode(dept.getDepartNo());
} }
......
...@@ -3889,7 +3889,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3889,7 +3889,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord = new TPreEmpBadRecord(); tPreEmpBadRecord = new TPreEmpBadRecord();
tPreEmpBadRecord.setOldId(oldBadRecordMap.get(empIdCard)); tPreEmpBadRecord.setOldId(oldBadRecordMap.get(empIdCard));
tPreEmpBadRecord.setPreMainId(mainId); tPreEmpBadRecord.setPreMainId(mainId);
if (employee != null) {
tPreEmpBadRecord.setEmpName(employee.getEmpName());
}
tPreEmpBadRecord.setEmpIdcard(empIdCard); tPreEmpBadRecord.setEmpIdcard(empIdCard);
tPreEmpBadRecord.setCreateBy(user.getId()); tPreEmpBadRecord.setCreateBy(user.getId());
tPreEmpBadRecord.setCreateName(user.getNickname()); tPreEmpBadRecord.setCreateName(user.getNickname());
......
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