Commit 19000d23 authored by hongguangwu's avatar hongguangwu

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

parents cc02b5ad c9ffd1d2
......@@ -285,7 +285,7 @@ public class TEmpContractAlertServiceImpl extends ServiceImpl<TEmpContractAlertM
.eq(TEmployeeContractInfo::getInUse,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getContractType,CommonConstants.ONE_STRING)
.eq(TEmployeeContractInfo::getWorkFlag,CommonConstants.ZERO_STRING)
.ne(TEmployeeContractInfo::getSituation,"续签")
.ne(TEmployeeContractInfo::getSituation,"作废")
.ne(TEmployeeContractInfo::getSituation,"终止")
.le(TEmployeeContractInfo::getContractEnd,DateUtil.dateIncreaseByDay(
DateUtil.dateIncreaseByMonth(DateUtil.getCurrentDateTime(),
......
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