Skip to content

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

MVP1.6.6-预入职相关_保存审核等

parent 0bf1006d
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 16 deletions
yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TPreEmpMainServiceImpl.java
View file @ 99b8955a
......@@ -168,8 +168,10 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
}
if (main != null) {
if (CommonConstants.ONE_STRING.equals(main.getStatus())
|| CommonConstants.TWO_STRING.equals(main.getStatus())
|| CommonConstants.FOUR_STRING.equals(main.getStatus())) {
|| CommonConstants.TWO_STRING.equals(main.getStatus())) {
return R.failed("信息审核中，请耐心等待！");
}
if (CommonConstants.FOUR_STRING.equals(main.getStatus())) {
return R.failed("信息已填写，请勿重复操作！");
}
TPreEmployeeInfo tPreEmployeeInfo = tPreEmployeeInfoService.getTPreEmployeeInfoList(main.getId());
......@@ -195,6 +197,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
tPreEmployeeProject = new TPreEmployeeProject();
tPreEmployeeProject.setEmpIdcard(main.getEmpIdcard());
tPreEmployeeProject.setEmpName(main.getEmpName());
tPreEmployeeProject.setUnitId(dept.getCustomerId());
tPreEmployeeProject.setUnitName(dept.getCustomerName());
tPreEmployeeProject.setUnitNo(dept.getCustomerNo());
tPreEmployeeProject.setBusinessPrimaryType(dept.getBusinessPrimaryType());
tPreEmployeeProject.setBusinessSecondType(dept.getBusinessSecondType());
tPreEmployeeProject.setBusinessThirdType(dept.getBusinessThirdType());
tPreEmployeeProject.setDeptId(main.getDeptId());
tPreEmployeeProject.setDeptName(main.getDeptName());
tPreEmployeeProject.setDeptNo(main.getDeptNo());
......@@ -266,6 +274,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
vo.setTpreEmployeeInfo(tPreEmployeeInfo);
tPreEmployeeProject = new TPreEmployeeProject();
tPreEmployeeProject.setEmpIdcard(main.getEmpIdcard());
tPreEmployeeProject.setUnitId(dept.getCustomerId());
tPreEmployeeProject.setUnitName(dept.getCustomerName());
tPreEmployeeProject.setUnitNo(dept.getCustomerNo());
tPreEmployeeProject.setBusinessPrimaryType(dept.getBusinessPrimaryType());
tPreEmployeeProject.setBusinessSecondType(dept.getBusinessSecondType());
tPreEmployeeProject.setBusinessThirdType(dept.getBusinessThirdType());
tPreEmployeeProject.setDeptId(main.getDeptId());
tPreEmployeeProject.setDeptName(main.getDeptName());
tPreEmployeeProject.setDeptNo(main.getDeptNo());
......@@ -876,7 +890,12 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else {
tPreEmployeeInfo.setIsCollege(CommonConstants.ZERO_INT);
}
tPreEmployeeInfo.setHignEducation(tPreEmpEducation.getEducationName());
}
tPreEmployeeInfo.setSchool(tPreEmpEducation.getSchool());
tPreEmployeeInfo.setMajor(tPreEmpEducation.getMajor());
tPreEmployeeInfo.setAdmissionDate(tPreEmpEducation.getEntryDate());
tPreEmployeeInfo.setGradutionDate(tPreEmpEducation.getGradutionDate());
}
// 生成性别年龄等：
this.setBaseSexInfo(tPreEmployeeInfo);
......@@ -984,6 +1003,23 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
if (dept == null) {
return R.failed("根据项目id，未找到项目！");
}
if (tPreEmployeeInfo != null && tPreEmpEducation != null) {
if (Common.isNotNull(tPreEmpEducation.getEducationName())) {
if ("5".equals(tPreEmpEducation.getEducationName())
|| "6".equals(tPreEmpEducation.getEducationName())
|| "7".equals(tPreEmpEducation.getEducationName())
|| "8".equals(tPreEmpEducation.getEducationName())) {
tPreEmployeeInfo.setIsCollege(CommonConstants.ONE_INT);
} else {
tPreEmployeeInfo.setIsCollege(CommonConstants.ZERO_INT);
}
tPreEmployeeInfo.setHignEducation(tPreEmpEducation.getEducationName());
}
tPreEmployeeInfo.setSchool(tPreEmpEducation.getSchool());
tPreEmployeeInfo.setMajor(tPreEmpEducation.getMajor());
tPreEmployeeInfo.setAdmissionDate(tPreEmpEducation.getEntryDate());
tPreEmployeeInfo.setGradutionDate(tPreEmpEducation.getGradutionDate());
}
if (tPreEmployeeInfo != null && Common.isNotNull(tPreEmployeeInfo.getOldId())
&& Common.isNotNull(tPreEmployeeProject.getOldId())) {
newFlag = false;
......@@ -1019,18 +1055,6 @@ public class TPreEmpMainServiceImpl extends ServiceImpl<TPreEmpMainMapper, TPreE
} else {
// 新建档案、项目档案，将档案id赋值，给其他附属信息
if (tPreEmployeeInfo != null) {
if (tPreEmpEducation != null) {
if (Common.isNotNull(tPreEmpEducation.getEducationName())) {
if ("5".equals(tPreEmpEducation.getEducationName())
|| "6".equals(tPreEmpEducation.getEducationName())
|| "7".equals(tPreEmpEducation.getEducationName())
|| "8".equals(tPreEmpEducation.getEducationName())) {
tPreEmployeeInfo.setIsCollege(CommonConstants.ONE_INT);
} else {
tPreEmployeeInfo.setIsCollege(CommonConstants.ZERO_INT);
}
}
}
// 生成性别年龄等：
this.setBaseSexInfo(tPreEmployeeInfo);
......
yifu-archives/yifu-archives-biz/src/main/resources/mapper/TPreEmpMainMapper.xml
View file @ 99b8955a
......@@ -123,7 +123,7 @@
AND a.UNIT_ID = #{tPreEmpMain.unitId}
</if>
<if test="tPreEmpMain.unitName != null and tPreEmpMain.unitName.trim() != ''">
AND a.UNIT_NAME = #{tPreEmpMain.unitName}
AND a.UNIT_NAME like concat('%',#{tPreEmpMain.unitName},'%')
</if>
<if test="tPreEmpMain.unitNo != null and tPreEmpMain.unitNo.trim() != ''">
AND a.UNIT_NO = #{tPreEmpMain.unitNo}
......@@ -132,7 +132,7 @@
AND a.DEPT_ID = #{tPreEmpMain.deptId}
</if>
<if test="tPreEmpMain.deptName != null and tPreEmpMain.deptName.trim() != ''">
AND a.DEPT_NAME = #{tPreEmpMain.deptName}
AND a.DEPT_NAME like concat('%',#{tPreEmpMain.deptName},'%')
</if>
<if test="tPreEmpMain.deptNo != null and tPreEmpMain.deptNo.trim() != ''">
AND a.DEPT_NO = #{tPreEmpMain.deptNo}
......
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