Commit 6eb15037 authored by hongguangwu's avatar hongguangwu

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

parents 11468c34 276af6ba
...@@ -33,6 +33,8 @@ public class EmployeeConstants { ...@@ -33,6 +33,8 @@ public class EmployeeConstants {
public static final String DEPT_NO_EXIST = "未找到对应的项目,请核实"; public static final String DEPT_NO_EXIST = "未找到对应的项目,请核实";
public static final String CHECK_ERROR = "校验服务错误,请联系管理员!"; public static final String CHECK_ERROR = "校验服务错误,请联系管理员!";
public static final String CHECK_NO_RESPONSE = "校验服务器未返回,请联系管理员!"; public static final String CHECK_NO_RESPONSE = "校验服务器未返回,请联系管理员!";
public static final String MARRY_STATUS_NOT_NULL = "婚姻状况不可为空";
public static final String POLITICAL_STATUS_NOT_NULL = "婚姻状况不可为空";
// 拦截合同使用 // 拦截合同使用
public static final String SITUATION_ONE = "正常签订"; public static final String SITUATION_ONE = "正常签订";
......
...@@ -818,10 +818,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -818,10 +818,10 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg.add(EmployeeConstants.EMP_NATIONAL); errorMsg.add(EmployeeConstants.EMP_NATIONAL);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.EMP_NATIONAL)); errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.EMP_NATIONAL));
} }
if (Common.isEmpty(employeeInfo.getIdProvince())) { /*if (Common.isEmpty(employeeInfo.getIdProvince())) {
errorMsg.add(EmployeeConstants.ID_PROVINCE); errorMsg.add(EmployeeConstants.ID_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.ID_PROVINCE)); errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.ID_PROVINCE));
} }*/
if (Common.isEmpty(employeeInfo.getFileProvince())) { if (Common.isEmpty(employeeInfo.getFileProvince())) {
errorMsg.add(EmployeeConstants.FILE_PROVINCE); errorMsg.add(EmployeeConstants.FILE_PROVINCE);
errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE)); errorMsgMap.put(lineNum, new ErrorMessage(EmployeeConstants.FILE_PROVINCE));
...@@ -1078,6 +1078,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T ...@@ -1078,6 +1078,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
errorMsg = new HashSet<>(); errorMsg = new HashSet<>();
excel = excelVOList.get(i); excel = excelVOList.get(i);
//政治面貌不可为空
if(Common.isEmpty(excel.getEmpMarriStatus())){
errorMsg.add(EmployeeConstants.MARRY_STATUS_NOT_NULL);
}
//婚姻状态不可为空
if(Common.isEmpty(excel.getPoliticalStatus())){
errorMsg.add(EmployeeConstants.POLITICAL_STATUS_NOT_NULL);
}
if (deptMap.get(excel.getDeptNo()) == null) { if (deptMap.get(excel.getDeptNo()) == null) {
errorMsg.add(EmployeeConstants.DEPT_NO_ERROR); errorMsg.add(EmployeeConstants.DEPT_NO_ERROR);
} }
......
...@@ -312,6 +312,9 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai ...@@ -312,6 +312,9 @@ public class TAutoPaymentDetailServiceImpl extends ServiceImpl<TAutoPaymentDetai
if (Common.isNotNull(details)){ if (Common.isNotNull(details)){
updateList = new ArrayList<>(); updateList = new ArrayList<>();
for (TAutoPaymentDetail detail:details){ for (TAutoPaymentDetail detail:details){
if (detail.getRepeatHandleFlag().equals(excel.getRepeatHandleFlag())){
continue;
}
detail.setRepeatHandleFlag(excel.getRepeatHandleFlag()); detail.setRepeatHandleFlag(excel.getRepeatHandleFlag());
updateList.add(detail); updateList.add(detail);
} }
......
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