Skip to content

Y
yifu-mvp
Commit c90c08ad authored by hongguangwu's avatar hongguangwu
Browse files
Options

Merge remote-tracking branch 'origin/develop' into develop

parents 52db0d77 78347819
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TCertRecordServiceImpl.java
View file @ c90c08ad
...@@ -73,7 +73,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert ...@@ -73,7 +73,8 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda() TEmployeeContractInfo first = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING) .eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING) .eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING) .ne(TEmployeeContractInfo::getSituation,"终止")
.ne(TEmployeeContractInfo::getSituation,"作废")
.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard()) .eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
.orderByAsc(TEmployeeContractInfo::getContractStart) .orderByAsc(TEmployeeContractInfo::getContractStart)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
...@@ -82,9 +83,11 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert ...@@ -82,9 +83,11 @@ public class TCertRecordServiceImpl extends ServiceImpl<TCertRecordMapper, TCert
TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda() TEmployeeContractInfo last = contractInfoMapper.selectOne(Wrappers.<TEmployeeContractInfo>query().lambda()
.eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING) .eq(TEmployeeContractInfo::getDeleteFlag,CommonConstants.ZERO_STRING)
.eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING) .eq(TEmployeeContractInfo::getAuditStatus,CommonConstants.TWO_STRING)
.eq(TEmployeeContractInfo::getIsObsolete,CommonConstants.ZERO_STRING) .ne(TEmployeeContractInfo::getSituation,"终止")
.ne(TEmployeeContractInfo::getSituation,"作废")
.eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard()) .eq(TEmployeeContractInfo::getEmpIdcard,employeeInfo.getEmpIdcard())
.orderByDesc(TEmployeeContractInfo::getCreateTime) .isNotNull(TEmployeeContractInfo::getContractEnd)
.orderByDesc(TEmployeeContractInfo::getContractEnd)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
TCertRecordVo vo = new TCertRecordVo(); TCertRecordVo vo = new TCertRecordVo();
vo.setEmpIdcard(project.getEmpIdcard()); vo.setEmpIdcard(project.getEmpIdcard());
......
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