DeXun/fad_oa
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

入职流程完成

Browse Source
This commit is contained in:
hdka
2025-03-07 18:09:16 +08:00
parent f78b3dda14
commit 4a1009e02e
25 changed files with 296 additions and 515 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/EmployeeOnboarding.java
View File

@@ -41,10 +41,7 @@ public class EmployeeOnboarding extends BaseEntity {
* 入职日期
*/
private Date joiningDate;
/**
* 试用期结束日期
*/
private Date probationPeriodEnd;
private String address;
@@ -52,42 +49,7 @@ public class EmployeeOnboarding extends BaseEntity {
* 直属经理ID
*/
private Long managerId;
/**
* 是否提交入职资料
*/
private Integer documentsSubmitted;
/**
* 是否完成入职培训
*/
private Integer orientationCompleted;
/**
* 入职状态(pending,completed,onboarding)
*/
private Long joiningStatus;
/**
* 是否完成招聘与面试
*/
private Integer recruitmentCompleted;
/**
* 是否已发放Offer
*/
private Integer offerIssued;
/**
* 是否已签署合同
*/
private Integer contractSigned;
/**
* 入职材料/工作准备是否完成
*/
private Integer materialsPrepared;
/**
* 是否完成入职培训
*/
private Integer trainingCompleted;
/**
* 是否完成工作条件准备（权限分配、工位等）
*/
private Integer workConditionsPrepared;
/**
* 最高学历
*/
@@ -129,10 +91,6 @@ public class EmployeeOnboarding extends BaseEntity {
* 体重
*/
private Long weight;
/**
* 编制类型
*/
private String staffType;
/**
* 紧急联系人1
*/

58
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/bo/EmployeeOnboardingBo.java
View File

@@ -46,65 +46,11 @@ public class EmployeeOnboardingBo extends BaseEntity {
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date joiningDate;
/**
* 试用期结束日期
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Date probationPeriodEnd;
/**
* 直属经理ID
*/
private Long managerId;
/**
* 是否提交入职资料
*/
private Integer documentsSubmitted;
/**
* 是否完成入职培训
*/
private Integer orientationCompleted;
/**
* 入职状态(pending,completed,onboarding)
*/
@JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@DateTimeFormat(pattern = "yyyy-MM-dd")
private Long joiningStatus;
/**
* 是否完成招聘与面试
*/
private Integer recruitmentCompleted;
/**
* 是否已发放Offer
*/
private Integer offerIssued;
/**
* 是否已签署合同
*/
private Integer contractSigned;
/**
* 入职材料/工作准备是否完成
*/
private Integer materialsPrepared;
/**
* 是否完成入职培训
*/
private Integer trainingCompleted;
/**
* 是否完成工作条件准备（权限分配、工位等）
*/
private Integer workConditionsPrepared;
/**
* 最高学历
*/
@@ -154,10 +100,6 @@ public class EmployeeOnboardingBo extends BaseEntity {
*/
private Long weight;
/**
* 编制类型
*/
private String staffType;
/**
* 紧急联系人1

67
ruoyi-oa/src/main/java/com/ruoyi/oa/domain/vo/EmployeeOnboardingVo.java
View File

@@ -48,11 +48,6 @@ public class EmployeeOnboardingVo extends EmployeeOnboarding {
@ExcelProperty(value = "入职日期")
private Date joiningDate;
/**
* 试用期结束日期
*/
@ExcelProperty(value = "试用期结束日期")
private Date probationPeriodEnd;
/**
* 直属经理ID
@@ -60,62 +55,6 @@ public class EmployeeOnboardingVo extends EmployeeOnboarding {
@ExcelProperty(value = "直属经理ID")
private Long managerId;
/**
* 是否提交入职资料
*/
@ExcelProperty(value = "是否提交入职资料")
private Integer documentsSubmitted;
/**
* 是否完成入职培训
*/
@ExcelProperty(value = "是否完成入职培训")
private Integer orientationCompleted;
/**
* 入职状态(pending,completed,onboarding)
*/
@ExcelProperty(value = "入职状态(pending,completed,onboarding)", converter = ExcelDictConvert.class)
@ExcelDictFormat(dictType = "joining_status")
private Long joiningStatus;
/**
* 是否完成招聘与面试
*/
@ExcelProperty(value = "是否完成招聘与面试")
private Integer recruitmentCompleted;
/**
* 是否已发放Offer
*/
@ExcelProperty(value = "是否已发放Offer")
private Integer offerIssued;
/**
* 是否已签署合同
*/
@ExcelProperty(value = "是否已签署合同")
private Integer contractSigned;
/**
* 入职材料/工作准备是否完成
*/
@ExcelProperty(value = "入职材料/工作准备是否完成")
private Integer materialsPrepared;
/**
* 是否完成入职培训
*/
@ExcelProperty(value = "是否完成入职培训")
private Integer trainingCompleted;
/**
* 是否完成工作条件准备（权限分配、工位等）
*/
@ExcelProperty(value = "是否完成工作条件准备", converter = ExcelDictConvert.class)
@ExcelDictFormat(readConverterExp = "权=限分配、工位等")
private Integer workConditionsPrepared;
/**
* 最高学历
*/
@@ -170,12 +109,6 @@ public class EmployeeOnboardingVo extends EmployeeOnboarding {
@ExcelProperty(value = "体重")
private Long weight;
/**
* 编制类型
*/
@ExcelProperty(value = "编制类型")
private String staffType;
/**
* 紧急联系人1
*/

1
ruoyi-oa/src/main/java/com/ruoyi/oa/mapper/EmployeeOnboardingMapper.java
View File

@@ -13,4 +13,5 @@ import com.ruoyi.oa.domain.vo.EmployeeOnboardingVo;
*/
public interface EmployeeOnboardingMapper extends BaseMapperPlus<EmployeeOnboardingMapper, EmployeeOnboarding, EmployeeOnboardingVo> {
Boolean updateByUserId(EmployeeOnboarding update);
}

13
ruoyi-oa/src/main/java/com/ruoyi/oa/service/impl/EmployeeOnboardingServiceImpl.java
View File

@@ -83,17 +83,7 @@ public class EmployeeOnboardingServiceImpl implements IEmployeeOnboardingService
LambdaQueryWrapper<EmployeeOnboarding> lqw = Wrappers.lambdaQuery();
lqw.eq(bo.getUserId() != null, EmployeeOnboarding::getUserId, bo.getUserId());
lqw.eq(bo.getJoiningDate() != null, EmployeeOnboarding::getJoiningDate, bo.getJoiningDate());
lqw.eq(bo.getProbationPeriodEnd() != null, EmployeeOnboarding::getProbationPeriodEnd, bo.getProbationPeriodEnd());
lqw.eq(bo.getManagerId() != null, EmployeeOnboarding::getManagerId, bo.getManagerId());
lqw.eq(bo.getDocumentsSubmitted() != null, EmployeeOnboarding::getDocumentsSubmitted, bo.getDocumentsSubmitted());
lqw.eq(bo.getOrientationCompleted() != null, EmployeeOnboarding::getOrientationCompleted, bo.getOrientationCompleted());
lqw.eq(bo.getJoiningStatus() != null, EmployeeOnboarding::getJoiningStatus, bo.getJoiningStatus());
lqw.eq(bo.getRecruitmentCompleted() != null, EmployeeOnboarding::getRecruitmentCompleted, bo.getRecruitmentCompleted());
lqw.eq(bo.getOfferIssued() != null, EmployeeOnboarding::getOfferIssued, bo.getOfferIssued());
lqw.eq(bo.getContractSigned() != null, EmployeeOnboarding::getContractSigned, bo.getContractSigned());
lqw.eq(bo.getMaterialsPrepared() != null, EmployeeOnboarding::getMaterialsPrepared, bo.getMaterialsPrepared());
lqw.eq(bo.getTrainingCompleted() != null, EmployeeOnboarding::getTrainingCompleted, bo.getTrainingCompleted());
lqw.eq(bo.getWorkConditionsPrepared() != null, EmployeeOnboarding::getWorkConditionsPrepared, bo.getWorkConditionsPrepared());
return lqw;
}
@@ -118,7 +108,8 @@ public class EmployeeOnboardingServiceImpl implements IEmployeeOnboardingService
public Boolean updateByBo(EmployeeOnboardingBo bo) {
EmployeeOnboarding update = BeanUtil.toBean(bo, EmployeeOnboarding.class);
validEntityBeforeSave(update);
return baseMapper.updateById(update) > 0;
return baseMapper.updateByUserId(update);
}
/**

35
ruoyi-oa/src/main/resources/mapper/oa/EmployeeOnboardingMapper.xml
View File

@@ -9,17 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="idPhoto" column="id_photo"/>
<result property="userId" column="user_id"/>
<result property="joiningDate" column="joining_date"/>
<result property="probationPeriodEnd" column="probation_period_end"/>
<result property="managerId" column="manager_id"/>
<result property="documentsSubmitted" column="documents_submitted"/>
<result property="orientationCompleted" column="orientation_completed"/>
<result property="joiningStatus" column="joining_status"/>
<result property="recruitmentCompleted" column="recruitment_completed"/>
<result property="offerIssued" column="offer_issued"/>
<result property="contractSigned" column="contract_signed"/>
<result property="materialsPrepared" column="materials_prepared"/>
<result property="trainingCompleted" column="training_completed"/>
<result property="workConditionsPrepared" column="work_conditions_prepared"/>
<result property="highestDegree" column="highest_degree"/>
<result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/>
@@ -34,10 +24,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<result property="politicalStatus" column="political_status"/>
<result property="height" column="height"/>
<result property="weight" column="weight"/>
<result property="staffType" column="staff_type"/>
<result property="emergencyContact1" column="emergency_contact1"/>
<result property="emergencyContact2" column="emergency_contact2"/>
</resultMap>
<update id="updateByUserId" parameterType="com.ruoyi.oa.domain.EmployeeOnboarding">
update employee_onboarding
<set>
<if test="idPhoto != null and idPhoto != 0">id_photo = #{idPhoto},</if>
<if test="joiningDate != null and joiningDate != ''">joining_date = #{joiningDate},</if>
<if test="managerId != null and managerId != ''">manager_id = #{managerId},</if>
<if test="highestDegree != null and highestDegree != ''">highest_degree = #{highestDegree},</if>
<if test="remark != null and remark != ''">remark = #{remark},</if>
<if test="delFlag != null and delFlag != ''">del_flag = #{delFlag},</if>
<if test="birthDate != null and birthDate != ''">birth_date = #{birthDate},</if>
<if test="ethnicity != null and ethnicity != ''">ethnicity = #{ethnicity},</if>
<if test="confirmDate != null and confirmDate != ''">confirm_date = #{confirmDate},</if>
<if test="maritalStatus != null and maritalStatus != ''">marital_status = #{maritalStatus},</if>
<if test="politicalStatus != null and politicalStatus != ''">political_status = #{politicalStatus},</if>
<if test="height != null and height != ''">height = #{height},</if>
<if test="weight != null and weight != ''">weight = #{weight},</if>
<if test="emergencyContact1 != null and emergencyContact1 != ''">emergency_contact1 = #{emergencyContact1},</if>
<if test="emergencyContact2 != null and emergencyContact2 != ''">emergency_contact2 = #{emergencyContact2},</if>
</set>
where user_id = #{userId}
</update>
</mapper>