Commit 5a836f7a authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_先删后加

parent 2fddaa3c
...@@ -182,13 +182,15 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> { ...@@ -182,13 +182,15 @@ public interface TEmployeeProjectService extends IService<TEmployeeProject> {
**/ **/
TEmployeeProject getByEmpIdAndDeptId(String empId, String deptId); TEmployeeProject getByEmpIdAndDeptId(String empId, String deptId);
TEmployeeProject getByEmpIdCardAndDeptId(String empIdCard, String deptId);
/** /**
* @Description: 获取已减项或已删除的项目档案信息 * @Description: 获取已减项或已删除的项目档案信息
* @Author: hgw * @Author: hgw
* @Date: 2024/6/19 15:00 * @Date: 2024/6/19 15:00
* @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject * @return: com.yifu.cloud.plus.v1.yifu.archives.entity.TEmployeeProject
**/ **/
TEmployeeProject getByEmpIdAndDeptIdAndDelete(String empId, String deptId); TEmployeeProject getByEmpIdCardAndDeptIdAndDelete(String empIdCard, String deptId);
R<Map<String, String>> getProjectByIdCard(String empIdCard); R<Map<String, String>> getProjectByIdCard(String empIdCard);
......
...@@ -1340,17 +1340,31 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap ...@@ -1340,17 +1340,31 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
} }
@Override @Override
public TEmployeeProject getByEmpIdAndDeptIdAndDelete(String empId, String deptId) { public TEmployeeProject getByEmpIdCardAndDeptId(String empIdCard, String deptId) {
TEmployeeProject employeeProject = null; TEmployeeProject employeeProject = null;
if (Common.isNotNull(empId) && Common.isNotNull(deptId)) { if (Common.isEmpty(empIdCard) || Common.isEmpty(deptId)) {
return employeeProject;
}
employeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda() employeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpId, empId) .eq(TEmployeeProject::getEmpIdcard, empIdCard)
.eq(TEmployeeProject::getDeptId, deptId) .eq(TEmployeeProject::getDeptId, deptId)
.ne(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT) .eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT)
.eq(TEmployeeProject::getDeleteFlag, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
return employeeProject;
}
@Override
public TEmployeeProject getByEmpIdCardAndDeptIdAndDelete(String empIdCard, String deptId) {
TEmployeeProject employeeProject = null;
if (Common.isNotNull(empIdCard) && Common.isNotNull(deptId)) {
employeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpIdcard, empIdCard)
.eq(TEmployeeProject::getDeptId, deptId)
.ne(TEmployeeProject::getProjectStatus, CommonConstants.ONE_INT)
.eq(TEmployeeProject::getDeleteFlag, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL)); .eq(TEmployeeProject::getDeleteFlag, CommonConstants.ZERO_STRING).last(CommonConstants.LAST_ONE_SQL));
if (employeeProject == null) { if (employeeProject == null) {
employeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda() employeeProject = this.getOne(Wrappers.<TEmployeeProject>query().lambda()
.eq(TEmployeeProject::getEmpId, empId) .eq(TEmployeeProject::getEmpIdcard, empIdCard)
.eq(TEmployeeProject::getDeptId, deptId) .eq(TEmployeeProject::getDeptId, deptId)
.last(CommonConstants.LAST_ONE_SQL)); .last(CommonConstants.LAST_ONE_SQL));
} }
......
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