ソースを参照

联调修改步骤

zwj 10 ヶ月 前
コミット
3783851236

+ 3 - 4
ruoyi-common/src/main/java/com/ruoyi/common/constant/PostPlanEnum.java

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

+ 3 - 4
ruoyi-common/src/main/java/com/ruoyi/common/constant/PostProgrammeEnum.java

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

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

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

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

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