diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java index 5cf26427..69462587 100644 --- a/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java +++ b/ruoyi-common/src/main/java/com/ruoyi/common/enums/ApplyListStatusEnum.java @@ -21,7 +21,15 @@ public enum ApplyListStatusEnum { /**培训教育提交*/ TRAIN("4","培训教育提交"), /**承诺书已上传*/ - PROMISE("5","承诺书已上传"); + PROMISE("5","承诺书已上传"), + /**离职离岗材料提交*/ + LEAVESUBMIT("6","离职离岗材料提交"), + /**离职离岗审核通过*/ + LEAVEADUIT("7","离职离岗审核通过"), + /**离职离岗审核退回*/ + LEAVEBACK("8","离职离岗审核退回"); + + private final String status; diff --git a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml index 2cbb864e..491676de 100644 --- a/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/apply/TdApplyInfoListMapper.xml @@ -182,7 +182,7 @@ AND sm_post = #{smPost} - AND apply_status in ('5') + AND apply_status in ('5','6','7','8') ${params.dataScope}