联调修改步骤

ruoyi-common/src/main/java/com/ruoyi/common/constant/PostPlanEnum.java

@@ -16,10 +16,9 @@ public enum PostPlanEnum {
     STATUS_HR_PASS("通过；", 3),
     STATUS_HR_BACK("驳回；", 4),
 
-    // 流转步骤
-    STEP_HR("人力资源", 2),
-    STEP_ICFA("内控法务", 1),
-    STEP_SCHEME("方案入档",3),
+    // 流转步骤 默认步骤从1开始
+    STEP("步骤2", 2),
+    STEP_UP("步骤3", 3),
 
     //status_icfa 2-内控法务部审批-状态：1-待审核；3-通过；4-驳回；
     STATUS_ICFA_WAIT("待审核", 1),

ruoyi-common/src/main/java/com/ruoyi/common/constant/PostProgrammeEnum.java

@@ -17,10 +17,9 @@ public enum PostProgrammeEnum {
     STATUS_HR_BACK("驳回；", 4),
 
 
-    // 流转步骤
-    STEP_HR("人力资源", 1),
-    STEP_ICFA("内控法务", 2),
-    STEP_SCHEME("方案入档",3),
+    // 流转步骤 默认步骤从1开始
+    STEP("步骤2", 2),
+    STEP_UP("步骤3",3),
 
 
     //status_icfa 2-内控法务部审批-状态：1-待审核；3-通过；4-驳回；

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostPlanServiceImpl.java

@@ -238,7 +238,7 @@ public class PostPlanServiceImpl extends ServiceImpl<PostPlanMapper, PostPlan> i
         data.setReasonIcfa(reasonIcfa);
 
         if (statusIcfa == PostPlanEnum.STATUS_ICFA_PASS.getValue()) {
-            data.setStep(PostPlanEnum.STEP_ICFA.getValue());
+            data.setStep(PostPlanEnum.STEP.getValue());
             data.setStatus(PostPlanEnum.STATUS_ING.getValue());//审核中
         } else {
             data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
@@ -278,7 +278,7 @@ public class PostPlanServiceImpl extends ServiceImpl<PostPlanMapper, PostPlan> i
         data.setStatus(statusHr);//最终审核结果
 
         if(statusHr==PostPlanEnum.STATUS_ICFA_PASS.getValue()){
-            data.setStep(PostPlanEnum.STEP_HR.getValue());
+            data.setStep(PostPlanEnum.STEP_UP.getValue());
             // 如果审核通过开始初始化岗检排名表
             initializationPostAssessmentRating(id);
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/impl/PostProgrammeServiceImpl.java

@@ -137,7 +137,7 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         data.setStatusHrUserId(SecurityUtils.getUserId());
         if (statusHr == PostPlanEnum.STATUS_HR_PASS.getValue()) {
             data.setStatus(PostProgrammeEnum.STATUS_ING.getValue());//审核中
-            data.setStep(PostProgrammeEnum.STEP_HR.getValue());
+            data.setStep(PostProgrammeEnum.STEP.getValue());
         } else {
             data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
         }
@@ -174,7 +174,7 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         data.setReasonIcfa(reasonIcfa);
         data.setStatus(statusIcfa);//最终审核结果
         if (statusIcfa == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
-            data.setStep(PostProgrammeEnum.STEP_ICFA.getValue());
+            data.setStep(PostProgrammeEnum.STEP_UP.getValue());
         }
         data.setStatusIcfaUserId(SecurityUtils.getUserId());
         data.setDateIcfa(DateUtils.getNowDate());