Commit 5dd18334 authored by hongguangwu's avatar hongguangwu

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

parents 731aff24 9fb36c4b
......@@ -9,14 +9,14 @@ public class EmployeeConstants {
public static final String REMARL_LENGTH = "备注长度超过200";
public static final String POST_LENGTH = "就职岗位长度超过20";
public static final String DEPT_NO_LENGTH = "项目编码长度超过20";
public static final String VALIDITY_START = "身份证开始日期必填";
public static final String VALIDITY_END = "身份证截止日期必填";
public static final String EMP_NATIONAL = "民族必填";
public static final String ID_PROVINCE = "户籍所在地必填";
public static final String FILE_PROVINCE = "档案所在地必填";
public static final String EMP_REGIS_TYPE = "户口性质必填";
public static final String IS_COLLEGE = "是否大专及以上必填";
public static final String CONTACT_ADDRESS = "通信地址必填";
public static final String VALIDITY_START = "身份证开始日期必填";
public static final String VALIDITY_END = "身份证截止日期必填";
public static final String EMP_NATIONAL = "民族必填";
public static final String ID_PROVINCE = "户籍所在地必填";
public static final String FILE_PROVINCE = "档案所在地必填";
public static final String EMP_REGIS_TYPE = "户口性质必填";
public static final String IS_COLLEGE = "是否大专及以上必填";
public static final String CONTACT_ADDRESS = "通信地址必填";
public static final String EMP_NATRUE_ZERO = "派遣";
public static final String EMP_NATRUE_ONE = "外包";
public static final String EMP_NATRUE_THREE = "内部员工";
......
......@@ -781,27 +781,27 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
private void checkEmployeeVOR(long lineNum, EmployeeVO employeeInfo, Map<Long, ErrorMessage> errorMsgMap, Set<String> errorMsg) {
if (Common.isEmpty(employeeInfo.getEmpIdcard())) {
errorMsg.add("身份证号必填");
errorMsgMap.put(lineNum, new ErrorMessage("身份证号必填"));
errorMsg.add("身份证号必填");
errorMsgMap.put(lineNum, new ErrorMessage("身份证号必填"));
}
if (Common.isEmpty(employeeInfo.getDeptNo())) {
errorMsg.add("项目编码必填");
errorMsgMap.put(lineNum, new ErrorMessage("项目编码必填"));
errorMsg.add("项目编码必填");
errorMsgMap.put(lineNum, new ErrorMessage("项目编码必填"));
} else if (employeeInfo.getDeptNo().length() > 20) {
errorMsg.add("项目编码超长");
errorMsgMap.put(lineNum, new ErrorMessage("项目编码超长"));
errorMsg.add("项目编码超长");
errorMsgMap.put(lineNum, new ErrorMessage("项目编码超长"));
}
if (Common.isEmpty(employeeInfo.getEmpName())) {
errorMsg.add("员工姓名必填");
errorMsgMap.put(lineNum, new ErrorMessage("员工姓名必填"));
errorMsg.add("员工姓名必填");
errorMsgMap.put(lineNum, new ErrorMessage("员工姓名必填"));
}
if (Common.isEmpty(employeeInfo.getEmpPhone())) {
errorMsg.add("手机号码必填");
errorMsgMap.put(lineNum, new ErrorMessage("手机号码必填"));
errorMsg.add("手机号码必填");
errorMsgMap.put(lineNum, new ErrorMessage("手机号码必填"));
}
if (Common.isEmpty(employeeInfo.getEmpRegisType())) {
errorMsg.add("户口性质必填");
errorMsgMap.put(lineNum, new ErrorMessage("户口性质必填"));
errorMsg.add("户口性质必填");
errorMsgMap.put(lineNum, new ErrorMessage("户口性质必填"));
}
//婚姻状态不可为空
if(Common.isEmpty(employeeInfo.getEmpMarriStatus())){
......
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