Commit 6ca89e82 authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 46d11022
......@@ -283,6 +283,10 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
pre.setOverFlag(CommonConstants.ONE_STRING);
pre.setSignFlag(CommonConstants.ONE_STRING);
}
String errorInfo = initDateInfo(pre,contract);
if (null != errorInfo){
return R.failed(errorInfo);
}
int res = -1;
if (Common.isNotNull(pre.getId())){
res = baseMapper.updateById(pre);
......@@ -620,7 +624,36 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
//更新岗位名称
return null;
}
private String initDateInfo(TEmployeeContractPreNew preVo, TEmployeeContractInfo contract) {
TEmployeeContractDateVo vo;
//标准合同/劳务协议/实习协议/劳务派遣合同/非全日制/其他合同
//1:"标准合同,3:“劳务协议”,5:“实习协议,8:“非全日制’,9:"补贴合同,13:’见习协议,18:“兼职协议”,19:”临时聘用合同,20:"劳务派遣合同’,21:’其他
if (CommonConstants.FIVE_STRING.equals(preVo.getContractType())){
//处理实习协议
preVo.setContractStart(preVo.getInternshipPeriodStart());
preVo.setContractEnd(preVo.getInternshipPeriodEnd());
}
if (Common.isNotNull(preVo.getInternshipPeriodStart()) && Common.isNotNull(preVo.getInternshipPeriodEnd())){
if (preVo.getInternshipPeriodEnd().before(preVo.getInternshipPeriodStart())){
return "实习结束日期需大于等于实习开始日期";
}
}
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if (Common.isNotNull(preVo.getContractStart()) && Common.isNotNull(preVo.getContractEnd())){
if (preVo.getContractEnd().before(preVo.getContractStart())){
return "合同截止日期需大于等于合同开始日期";
}
}
if (Common.isNotNull(preVo.getDispatchPeriodStart()) && Common.isNotNull(preVo.getDispatchPeriodEnd())){
if (preVo.getDispatchPeriodEnd().before(preVo.getDispatchPeriodStart())){
return "派遣结束日期需大于等于派遣开始日期";
}
}
//更新岗位名称
return null;
}
/**
* @Author fxj
* @Description 合同续签待签订信息单个/批量发起签署任务
......
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