Commit aebd0be4 authored by huyuchen's avatar huyuchen

Merge remote-tracking branch 'origin/MVP1.7.6' into MVP1.7.6

parents a9dbf190 52ebef09
...@@ -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;
// 字典值结束 // 字典值结束
......
...@@ -3824,7 +3824,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -3824,7 +3824,7 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
&& ("是".equals(excel.getBadRecordFlag()) || "否".equals(excel.getBadRecordFlag())) && ("是".equals(excel.getBadRecordFlag()) || "否".equals(excel.getBadRecordFlag()))
) { ) {
String badFlag = CommonConstants.ZERO_STRING; String badFlag = CommonConstants.ZERO_STRING;
if("否".equals(excel.getHaveQualification())){ if("否".equals(excel.getBadRecordFlag())){
badFlag = CommonConstants.ONE_STRING; badFlag = CommonConstants.ONE_STRING;
} }
badRecord = new TEmpBadRecord(); badRecord = new TEmpBadRecord();
......
...@@ -1472,7 +1472,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1472,7 +1472,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if(Common.isNotNull(tPreEmpBadRecord.getRemark())){ if(Common.isNotNull(tPreEmpBadRecord.getRemark())){
if(tPreEmpBadRecord.getRemark().contains("未曾经")){ if(tPreEmpBadRecord.getRemark().contains("未曾经")){
tPreEmpBadRecord.setBadRecordFlag(CommonConstants.ONE_STRING); tPreEmpBadRecord.setBadRecordFlag(CommonConstants.ONE_STRING);
} else { } else {
tPreEmpBadRecord.setBadRecordFlag(CommonConstants.ZERO_STRING); tPreEmpBadRecord.setBadRecordFlag(CommonConstants.ZERO_STRING);
} }
...@@ -1490,8 +1489,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -1490,8 +1489,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
.set(TPreEmpBadRecord::getHappenTime, null) .set(TPreEmpBadRecord::getHappenTime, null)
.set(TPreEmpBadRecord::getLoseFee, null) .set(TPreEmpBadRecord::getLoseFee, null)
.set(TPreEmpBadRecord::getLoseFeeOther, null) .set(TPreEmpBadRecord::getLoseFeeOther, null)
.set(TPreEmpBadRecord::getProject, null)
.set(TPreEmpBadRecord::getProjectCode, null)
.set(TPreEmpBadRecord::getUpdateBy, user.getId()) .set(TPreEmpBadRecord::getUpdateBy, user.getId())
.set(TPreEmpBadRecord::getUpdateTime, LocalDateTime.now()); .set(TPreEmpBadRecord::getUpdateTime, LocalDateTime.now());
tPreEmpBadRecordService.update(null, updateDiyInfoWrapper); tPreEmpBadRecordService.update(null, updateDiyInfoWrapper);
...@@ -3889,6 +3886,9 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3889,6 +3886,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);
tPreEmpBadRecord.setSettleDomain(deptId);
tPreEmpBadRecord.setProject(dept.getDepartName());
tPreEmpBadRecord.setProjectCode(dept.getDepartNo());
if (employee != null) { if (employee != null) {
tPreEmpBadRecord.setEmpName(employee.getEmpName()); tPreEmpBadRecord.setEmpName(employee.getEmpName());
} }
...@@ -3898,9 +3898,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE ...@@ -3898,9 +3898,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmpBadRecord.setCreateTime(LocalDateTime.now()); tPreEmpBadRecord.setCreateTime(LocalDateTime.now());
if ("是".equals(info.getRemark())) { if ("是".equals(info.getRemark())) {
// 有不良记录,存项目信息 // 有不良记录,存项目信息
tPreEmpBadRecord.setSettleDomain(deptId);
tPreEmpBadRecord.setProject(dept.getDepartName());
tPreEmpBadRecord.setProjectCode(dept.getDepartNo());
tPreEmpBadRecord.setRemark("曾经或正在追究与承担过刑事责任"); tPreEmpBadRecord.setRemark("曾经或正在追究与承担过刑事责任");
// 1.9.6-chenyuxi: 记录不良记录标识 // 1.9.6-chenyuxi: 记录不良记录标识
tPreEmpBadRecord.setBadRecordFlag(CommonConstants.ZERO_STRING); tPreEmpBadRecord.setBadRecordFlag(CommonConstants.ZERO_STRING);
......
...@@ -363,7 +363,7 @@ public interface CommonConstants { ...@@ -363,7 +363,7 @@ public interface CommonConstants {
public static final String JAR_TYPE = "jar"; public static final String JAR_TYPE = "jar";
int BATCH_COUNT = 100; int BATCH_COUNT = 100;
int BATCH_COUNT1 = 2000; int BATCH_COUNT1 = 2000;
String IMPORT_DATA_ANALYSIS_ERROR = "数据导入解析异常,请检查表数据格式(常见错误:1.日期格式:yyyy-MM-dd,2.比例为整数且不含%)"; String IMPORT_DATA_ANALYSIS_ERROR = "数据导入解析异常,请检查表数据格式(常见错误:1.日期格式:yyyy-MM-dd,2.比例为整数且不含%,3涉及金额相关的只能填数字)";
String IMPORT_DATA_ANALYSIS_ERROR_TWO = "数据导入解析异常,请检查表数据格式"; String IMPORT_DATA_ANALYSIS_ERROR_TWO = "数据导入解析异常,请检查表数据格式";
String CREATE_TIME = "CREATE_TIME"; String CREATE_TIME = "CREATE_TIME";
......
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