Commit 505f6f15 authored by huyuchen's avatar huyuchen

huych-入离职登记提交

parent 2d10b288
...@@ -152,7 +152,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -152,7 +152,10 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
.eq(TEmployeeProject::getEmpIdcard, vo.getEmpIdcard()) .eq(TEmployeeProject::getEmpIdcard, vo.getEmpIdcard())
.eq(TEmployeeProject::getDeptNo, vo.getDeptNo()) .eq(TEmployeeProject::getDeptNo, vo.getDeptNo())
.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL) .eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT).last(CommonConstants.LAST_ONE_SQL)); .and(obj -> obj.ne(TEmployeeProject::getProjectSource, CommonConstants.ONE_STRING)
.or().eq(TEmployeeProject::getProjectSource, CommonConstants.ONE_STRING)
.eq(TEmployeeProject::getStatus, CommonConstants.ONE_INT))
.last(CommonConstants.LAST_ONE_SQL));
if (Common.isNotNull(employeeProject)) { if (Common.isNotNull(employeeProject)) {
vo.setProjectTime(employeeProject.getCreateTime()); vo.setProjectTime(employeeProject.getCreateTime());
vo.setEmpProjectId(employeeProject.getId()); vo.setEmpProjectId(employeeProject.getId());
......
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