Browse Source

顺序bug

zhaowenjing 9 months ago
parent
commit
9462fbeff8

+ 2 - 2
ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostProgrammeController.java

@@ -198,7 +198,7 @@ public class PostProgrammeController extends BaseController {
198 198
     }
199 199
 
200 200
 
201
-    @ApiOperation("审核1:岗检方案审核-HR")
201
+    @ApiOperation("审核2:岗检方案审核-HR")
202 202
     @ApiImplicitParams({
203 203
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
204 204
             @ApiImplicitParam(name = "statusHr", value = "1-人力资源审批-状态:1-待审核;3-通过;4-驳回;", dataType = "Long", dataTypeClass = Long.class),
@@ -230,7 +230,7 @@ public class PostProgrammeController extends BaseController {
230 230
     }
231 231
 
232 232
 
233
-    @ApiOperation("审核2:岗检方案审核-Icfa")
233
+    @ApiOperation("审核1:岗检方案审核-Icfa")
234 234
     @ApiImplicitParams({
235 235
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
236 236
             @ApiImplicitParam(name = "statusIcfa", value = "2-内控法务部审批-状态:1-待审核;3-通过;4-驳回;", dataType = "Long", dataTypeClass = Long.class),

+ 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.getValue());
140
+            data.setStep(PostProgrammeEnum.STEP_UP.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_UP.getValue());
177
+            data.setStep(PostProgrammeEnum.STEP.getValue());
178 178
         }
179 179
         data.setStatusIcfaUserId(SecurityUtils.getUserId());
180 180
         data.setDateIcfa(DateUtils.getNowDate());