Commit 234980ed authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent b761d6ee
......@@ -740,7 +740,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
LambdaUpdateWrapper<TEmployeeContractPreNew> updateWrapper = new LambdaUpdateWrapper<>();
updateWrapper.eq(TEmployeeContractPreNew::getId, contractPre.getId())
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.FIVE_STRING)
.set(TEmployeeContractPreNew::getErrorInfo, "电子签发起失败:已超过合同开始日期一个月")
.set(TEmployeeContractPreNew::getErrorInfo, "发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签")
.set(TEmployeeContractPreNew::getErrorTime, LocalDateTimeUtils.convertLDToDate(LocalDate.now()));
this.update(updateWrapper);
......@@ -751,7 +751,7 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
contractAutoLog.setEmpName(contractPre.getEmployeeName());
contractAutoLog.setEmpIdcard(contractPre.getEmpIdcard());
contractAutoLog.setMainId(contractPre.getId());
contractAutoLog.setErrorInfo("电子签发起失败:已超过合同开始日期一个月");
contractAutoLog.setErrorInfo("发起时间距离合同开始日期已超过一个月,禁止使用电子签,请切换为线下签");
contractAutoLogService.save(contractAutoLog);
}
......@@ -984,6 +984,8 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.TWO_STRING)
.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING);
this.update(updateWrapper);
//更新合同的办理状态
updateEmpContractAlertHandleStatus(contractVO.getContractId(), CommonConstants.ONE_STRING);
}
}
}
......@@ -998,6 +1000,9 @@ public class TEmployeeContractPreNewServiceImpl extends ServiceImpl<TEmployeeCon
.set(TEmployeeContractPreNew::getProcessStatus, CommonConstants.TWO_STRING)
.set(TEmployeeContractPreNew::getSignType, CommonConstants.ONE_STRING);
this.update(updateWrapper);
//更新合同的办理状态
updateEmpContractAlertHandleStatus(contractVO.getContractId(), CommonConstants.ONE_STRING);
}
}
}
......
......@@ -696,7 +696,7 @@
SELECT
a.id
FROM t_employee_contract_pre_new a
where a.process_status in('3','5','7') and (a.expected_collection_time is null or a.expected_collection_time <![CDATA[ <= ]]> now())
where a.process_status in('1','5' and (a.expected_collection_time is null or a.expected_collection_time <![CDATA[ <= ]]> now())
</select>
<!--tEmployeeContractPreNew简单分页查询-->
......
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