Commit 9a8934dc authored by fangxinjiang's avatar fangxinjiang

合同续签待办-fxj

parent 34d2a345
......@@ -108,6 +108,9 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
@Autowired
private TAutoContractRuleInfoMapper contractRuleInfoMapper;
@Autowired
private TEmployeeContractPreHistoryMapper preHistoryMapper;
/**
* 合同续签预派单信息简单分页查询
*
......@@ -631,7 +634,23 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
}
if (CommonConstants.TWENTY_STRING.equals(preVo.getContractType())){
//处理劳务协议: 先看上一份合同是否为劳务协议,如果是取值上一份合同的劳务协议结束日期
preVo.setDispatchPeriodStart(DateUtil.addDayByDate(contract.getContractEnd(),1));
Date initDate = contract.getContractEnd();
if (Common.isNotNull(contract.getPreNewId())){
TEmployeeContractPreNew preNew = baseMapper.selectOne(Wrappers.<TEmployeeContractPreNew>query().lambda()
.eq(TEmployeeContractPreNew::getId, contract.getPreNewId())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(preNew) && Common.isNotNull(preNew.getDispatchPeriodEnd())){
initDate = preNew.getDispatchPeriodEnd();
}
}else {
TEmployeeContractPreHistory pre = preHistoryMapper.selectOne(Wrappers.<TEmployeeContractPreHistory>query().lambda()
.eq(TEmployeeContractPreHistory::getContractId,contract.getId())
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(pre) && Common.isNotNull(pre.getDispatchPeriodEnd())){
initDate = pre.getDispatchPeriodEnd();
}
}
preVo.setDispatchPeriodStart(DateUtil.addDayByDate(initDate,1));
if (Common.isNotNull(preVo.getDispatchPeriodYear()) && Common.isNotNull(preVo.getDispatchPeriodMonth())){
vo = new TEmployeeContractDateVo();
vo.setMonthAfter(Integer.parseInt(Common.isEmpty(preVo.getDispatchPeriodMonth()) ? "0": preVo.getDispatchPeriodMonth()));
......
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