Commit f7973a0e authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 1aa15559
......@@ -327,11 +327,9 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
TEmployeeContractDateVo vo = null;
TEmployeeContractPreNew preNew = null;
String innitError = null;
int i =0;
for (TEmployeeContractInfo contract : contractList){
i++;
alert = alertMap.get(contract.getId());
if (null == alert || i > 1){
if (null == alert){
checkVo = new TEmployeeAutoRegistCheckVo();
checkVo.setEmployeeName(contract.getEmpName());
checkVo.setEmpIdcard(contract.getEmpIdcard());
......@@ -544,6 +542,12 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
if (!CommonConstants.FIVE_STRING.equals(preVo.getContractType())){
//合同开始日期=上一份合同截止日期+1日
preVo.setContractStart(DateUtil.addDayByDate(contract.getContractEnd(),1));
//同商务合同一直 要 验证时间 截止时间大于等于开始时间、时间交叉
if (Common.isNotNull(preVo.getContractEnd())){
if (preVo.getContractEnd().before(preVo.getContractStart())){
return "合同截止日期需大于等于合同开始日期";
}
}
//单个确认中,针对预计合同发起时间、合同开始日期、合同截止日期的信息为显示具体日期,而批量确认显示的是规则文字,具体确认完毕至每条的续签信息中时,才显示具体日期 TODO
//增加“合同开始日期规则、合同截止日期规则”信息
//——合同开始日期规则,只有一种:等于上一份合同截止日期+1日,文字显示
......
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