diff --git a/src/com/engine/organization/entity/staff/param/StaffOutParam.java b/src/com/engine/organization/entity/staff/param/StaffOutParam.java index 3c4c9473..0a4a59a5 100644 --- a/src/com/engine/organization/entity/staff/param/StaffOutParam.java +++ b/src/com/engine/organization/entity/staff/param/StaffOutParam.java @@ -29,6 +29,14 @@ public class StaffOutParam { private Integer job; + /** + * 调整方式 1.流程 2.其它 + */ + private Integer changeMode; + + /** + * 变动数 + */ private Integer num; } diff --git a/src/com/engine/organization/entity/staff/param/TransactionParam.java b/src/com/engine/organization/entity/staff/param/TransactionParam.java deleted file mode 100644 index 357e9085..00000000 --- a/src/com/engine/organization/entity/staff/param/TransactionParam.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.engine.organization.entity.staff.param; - -/** - * @Author liang.cheng - * @Date 2023/9/1 2:03 PM - * @Description: TODO - * @Version 1.0 - */ -public class TransactionParam { -} diff --git a/src/com/engine/organization/enums/StaffChangeEnum.java b/src/com/engine/organization/enums/StaffChangeEnum.java index d913eb1f..81fe5b3d 100644 --- a/src/com/engine/organization/enums/StaffChangeEnum.java +++ b/src/com/engine/organization/enums/StaffChangeEnum.java @@ -3,14 +3,17 @@ package com.engine.organization.enums; /** * @Author liang.cheng * @Date 2023/9/1 1:50 PM - * @Description: 编制变更枚举 + * @Description: 编制及在编变更枚举 * @Version 1.0 */ public enum StaffChangeEnum { ADD(0, "增加"), - - REDUCE(1, "减少"); + REDUCE(1, "减少"), + FROZEN(2, "冻结"), + ENTRY(3, "入职"), + DIMISSION(4, "离职"), + TRANSFER(5, "转移"); private Integer value; diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.java b/src/com/engine/organization/mapper/staff/StaffMapper.java index 20dae234..5994a292 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.java +++ b/src/com/engine/organization/mapper/staff/StaffMapper.java @@ -33,6 +33,16 @@ public interface StaffMapper { */ List getStaffByFilter(@Param("companyId") Long companyId, @Param("departmentId") Long departmentId, @Param("jobId") Long jobId); + + /** + * @Description: b + * @Author: liang.cheng + * @Date: 2023/9/4 11:26 AM + * @param: [planId, companyId, departmentId, jobId] + * @return: com.engine.organization.entity.staff.po.StaffPO + */ + StaffPO customSelect(@Param("planId") Integer planId,@Param("companyId") Integer companyId, @Param("departmentId") Integer departmentId, @Param("jobId") Integer jobId); + /** * 插入编制方案 * diff --git a/src/com/engine/organization/mapper/staff/StaffMapper.xml b/src/com/engine/organization/mapper/staff/StaffMapper.xml index 41fb3eb3..be1ad222 100644 --- a/src/com/engine/organization/mapper/staff/StaffMapper.xml +++ b/src/com/engine/organization/mapper/staff/StaffMapper.xml @@ -67,6 +67,27 @@ order by update_time desc + + + +