Commit 0633d70a authored by huyuchen's avatar huyuchen

优化修改

parent 698d519f
...@@ -53,4 +53,5 @@ public class UpProjectSocialFundVo implements Serializable { ...@@ -53,4 +53,5 @@ public class UpProjectSocialFundVo implements Serializable {
String detailId; String detailId;
String contactAddress; String contactAddress;
String highEducation; String highEducation;
String flag;
} }
...@@ -1396,9 +1396,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1396,9 +1396,6 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (Common.isNotNull(vo.getFundStatus())) { if (Common.isNotNull(vo.getFundStatus())) {
employee.setFundStatus(Integer.parseInt(vo.getFundStatus())); employee.setFundStatus(Integer.parseInt(vo.getFundStatus()));
} }
if (Common.isNotNull(vo.getHighEducation())) {
employee.setHignEducation(vo.getHighEducation());
}
if (Common.isNotNull(vo.getFileProvince())) { if (Common.isNotNull(vo.getFileProvince())) {
employee.setFileProvince(Integer.parseInt(vo.getFileProvince())); employee.setFileProvince(Integer.parseInt(vo.getFileProvince()));
} }
...@@ -1413,7 +1410,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1413,7 +1410,12 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
if (Common.isNotNull(vo.getMobile())) { if (Common.isNotNull(vo.getMobile())) {
employee.setEmpPhone(vo.getMobile()); employee.setEmpPhone(vo.getMobile());
} }
if(Common.isEmpty(vo.getFlag())){
employee.setIsCollege(CommonConstants.ONE_INT); employee.setIsCollege(CommonConstants.ONE_INT);
if (Common.isNotNull(vo.getHighEducation())) {
employee.setHignEducation(vo.getHighEducation());
}
}
tEmployeeInfoMapper.updateSocialInfoById(employee); tEmployeeInfoMapper.updateSocialInfoById(employee);
} }
TEmployeeProject project = baseMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda() TEmployeeProject project = baseMapper.selectOne(Wrappers.<TEmployeeProject>query().lambda()
......
...@@ -832,59 +832,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -832,59 +832,6 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (excel.getEducationName().equals("中专")) { if (excel.getEducationName().equals("中专")) {
vo.setHighEducation("11"); vo.setHighEducation("11");
} }
}
if (Common.isNotNull(emp.getHignEducation())) {
if (excel.getEducationName().equals("文盲")) {
if (emp.getHignEducation() == "1") {
vo.setHighEducation("1");
}
}
if (excel.getEducationName().equals("小学")) {
if (emp.getHignEducation() == "2") {
vo.setHighEducation("2");
}
}
if (excel.getEducationName().equals("初中")) {
if (emp.getHignEducation() == "3") {
vo.setHighEducation("3");
}
}
if (excel.getEducationName().equals("高中")) {
if (emp.getHignEducation() == "4") {
vo.setHighEducation("4");
}
}
if (excel.getEducationName().equals("大专")) {
if (emp.getHignEducation() == "5") {
vo.setHighEducation("5");
}
}
if (excel.getEducationName().equals("本科")) {
if (emp.getHignEducation() == "6") {
vo.setHighEducation("6");
}
}
if (excel.getEducationName().equals("硕士")) {
if (emp.getHignEducation() == "7") {
vo.setHighEducation("7");
}
}
if (excel.getEducationName().equals("技工")) {
if (emp.getHignEducation() == "9") {
vo.setHighEducation("9");
}
}
if (excel.getEducationName().equals("职高")) {
if (emp.getHignEducation() == "10") {
vo.setHighEducation("10");
}
}
if (excel.getEducationName().equals("中专")) {
if (emp.getHignEducation() == "11") {
vo.setHighEducation("11");
}
}
} }
} }
} }
...@@ -2326,21 +2273,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2326,21 +2273,21 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
return true; return true;
} }
// 如果没有人员档案和项目档案的时候校验身份证和手机号码 // 如果没有人员档案和项目档案的时候校验身份证和手机号码
R<Boolean> checkRes = checkDaprUtil.checkIdCardAndMobile(excel.getEmpName(),excel.getEmpIdcard(),excel.getEmpMobile()); // R<Boolean> checkRes = checkDaprUtil.checkIdCardAndMobile(excel.getEmpName(),excel.getEmpIdcard(),excel.getEmpMobile());
if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){ // if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg())); // errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
return true; // return true;
} // }
// 校验手机号码重复 // // 校验手机号码重复
checkRes = archivesDaprUtil.checkMobile(excel.getEmpMobile()); // checkRes = archivesDaprUtil.checkMobile(excel.getEmpMobile());
if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){ // if (Common.isEmpty(checkRes) || checkRes.getCode() != CommonConstants.SUCCESS){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg())); // errorMessageList.add(new ErrorMessage(excel.getRowIndex(), checkRes.getMsg()));
return true; // return true;
} // }
if (checkRes.getData().booleanValue()){ // if (checkRes.getData().booleanValue()){
errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_MOBILE_REPEAT))); // errorMessageList.add(new ErrorMessage(excel.getRowIndex(), MsgUtils.getMessage(ErrorCodes.EMP_DISPATCH_EMP_MOBILE_REPEAT)));
return true; // return true;
} // }
} }
Date contractDateTemp = excel.getContractStart(); Date contractDateTemp = excel.getContractStart();
/*项目档案有可用状态的合同: /*项目档案有可用状态的合同:
...@@ -2389,12 +2336,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -2389,12 +2336,12 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(empVo.getEmpPhone()) && Common.isEmpty(excel.getEmpMobile())){ if (Common.isNotNull(empVo.getEmpPhone()) && Common.isEmpty(excel.getEmpMobile())){
excel.setEmpMobile(empVo.getEmpPhone()); excel.setEmpMobile(empVo.getEmpPhone());
} }
// 如果存在档案但是手机号码不为空校验号码 // // 如果存在档案但是手机号码不为空校验号码
if (Common.isNotNull(excel.getEmpMobile()) // if (Common.isNotNull(excel.getEmpMobile())
&& !excel.getEmpMobile().equals(empVo.getEmpPhone()) // && !excel.getEmpMobile().equals(empVo.getEmpPhone())
&& checkMobileAndIdcard(errorMessageList, excel)){ // && checkMobileAndIdcard(errorMessageList, excel)){
return true; // return true;
} // }
// 档案地 手机号码, 派单有数据 更新档案,派单没有 有档案取值档案数据 // 档案地 手机号码, 派单有数据 更新档案,派单没有 有档案取值档案数据
if (Common.isEmpty(excel.getFileProvince())){ if (Common.isEmpty(excel.getFileProvince())){
excel.setFileProvince(Common.isNotNullToStr(empVo.getFileProvince())); excel.setFileProvince(Common.isNotNullToStr(empVo.getFileProvince()));
...@@ -3543,6 +3490,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T ...@@ -3543,6 +3490,7 @@ public class TDispatchInfoServiceImpl extends ServiceImpl<TDispatchInfoMapper, T
if (Common.isNotNull(dis.getFundId())){ if (Common.isNotNull(dis.getFundId())){
vo.setFundStatus(CommonConstants.ZERO_STRING); vo.setFundStatus(CommonConstants.ZERO_STRING);
} }
vo.setFlag(CommonConstants.ONE_STRING);
vo.setEmpIdCard(dis.getEmpIdcard()); vo.setEmpIdCard(dis.getEmpIdcard());
vo.setDepartNo(dis.getSettleDomainCode()); vo.setDepartNo(dis.getSettleDomainCode());
if (flagTemp){ if (flagTemp){
......
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