Commit ab95856d authored by hongguangwu's avatar hongguangwu

MVP1.6.6-预入职相关_大专及以上

parent 267c1ced
......@@ -31,5 +31,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface TEmpProfessionalQualificationMapper extends BaseMapper<TEmpProfessionalQualification> {
void deleteByEmpId(@Param("empId") String empId);
void deleteProfessionalByEmpId(@Param("empId") String empId);
}
......@@ -31,5 +31,5 @@ import org.apache.ibatis.annotations.Param;
@Mapper
public interface TEmpWorkRecordingMapper extends BaseMapper<TEmpWorkRecording> {
void deleteByEmpId(@Param("empId") String empId);
void deleteWorkRecordByEmpId(@Param("empId") String empId);
}
......@@ -65,6 +65,6 @@ public interface TEmpProfessionalQualificationService extends IService<TEmpProfe
* @Date: 2024/6/19 18:27
* @return: void
**/
void deleteByEmpId(String empId);
void deleteProfessionalByEmpId(String empId);
}
......@@ -65,6 +65,6 @@ public interface TEmpWorkRecordingService extends IService<TEmpWorkRecording> {
* @Date: 2024/6/19 18:27
* @return: void
**/
void deleteByEmpId(String empId);
void deleteWorkRecordByEmpId(String empId);
}
......@@ -66,8 +66,8 @@ public class TEmpProfessionalQualificationServiceImpl extends ServiceImpl<TEmpPr
private final TEmployeeInfoMapper employeeInfoMapper;
@Override
public void deleteByEmpId(String empId) {
baseMapper.deleteByEmpId(empId);
public void deleteProfessionalByEmpId(String empId) {
baseMapper.deleteProfessionalByEmpId(empId);
}
@Override
......
......@@ -297,8 +297,8 @@ public class TEmpWorkRecordingServiceImpl extends ServiceImpl<TEmpWorkRecordingM
}
@Override
public void deleteByEmpId(String empId) {
baseMapper.deleteByEmpId(empId);
public void deleteWorkRecordByEmpId(String empId) {
baseMapper.deleteWorkRecordByEmpId(empId);
}
}
......@@ -1436,6 +1436,14 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
employee.setIsCollege(CommonConstants.ONE_INT);
if (Common.isNotNull(vo.getHighEducation())) {
employee.setHignEducation(vo.getHighEducation());
if ("5".equals(employee.getHignEducation())
|| "6".equals(employee.getHignEducation())
|| "7".equals(employee.getHignEducation())
|| "8".equals(employee.getHignEducation())) {
employee.setIsCollege(CommonConstants.ONE_INT);
} else {
employee.setIsCollege(CommonConstants.ZERO_INT);
}
}
if (Common.isNotNull(vo.getSchoolName())){
employee.setSchool(vo.getSchoolName());
......
......@@ -1131,7 +1131,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<TPreEmpProfessionalQualification> tPreEmpProfessionalQualificationList = vo.getTpreEmpProfessionalQualificationList();
if (tPreEmpProfessionalQualificationList != null) {
// 先删除其他信息
tEmpProfessionalQualificationService.deleteByEmpId(empId);
tEmpProfessionalQualificationService.deleteProfessionalByEmpId(empId);
TEmpProfessionalQualification info;
for (TPreEmpProfessionalQualification preInfo : tPreEmpProfessionalQualificationList) {
info = new TEmpProfessionalQualification();
......@@ -1162,7 +1162,7 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
List<TPreEmpWorkRecording> tPreEmpWorkRecordingList = vo.getTpreEmpWorkRecordingList();
if (tPreEmpWorkRecordingList != null) {
// 先删除其他信息
tEmpWorkRecordingService.deleteByEmpId(empId);
tEmpWorkRecordingService.deleteWorkRecordByEmpId(empId);
List<TEmpWorkRecording> tEmpWorkRecordingList = new ArrayList<>();
TEmpWorkRecording info;
for (TPreEmpWorkRecording preInfo : tPreEmpWorkRecordingList) {
......
......@@ -46,7 +46,7 @@
<result property="remark" column="REMARK"/>
</resultMap>
<delete id="deleteByEmpId">
<delete id="deleteProfessionalByEmpId">
delete from t_pre_emp_professional_qualification where EMP_ID = #{empId}
</delete>
......
......@@ -47,7 +47,7 @@
</resultMap>
<delete id="deleteByEmpId">
<delete id="deleteWorkRecordByEmpId">
delete from t_pre_emp_work_recording where EMP_ID = #{empId}
</delete>
</mapper>
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