Merge remote-tracking branch 'origin/master'

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

@@ -198,7 +198,7 @@ public class PostProgrammeController extends BaseController {
     }
 
 
-    @ApiOperation("审核1：岗检方案审核-HR")
+    @ApiOperation("审核2：岗检方案审核-HR")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "statusHr", value = "1-人力资源审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),
@@ -230,7 +230,7 @@ public class PostProgrammeController extends BaseController {
     }
 
 
-    @ApiOperation("审核2：岗检方案审核-Icfa")
+    @ApiOperation("审核1：岗检方案审核-Icfa")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "statusIcfa", value = "2-内控法务部审批-状态：1-待审核；3-通过；4-驳回；", dataType = "Long", dataTypeClass = Long.class),

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