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

@@ -105,7 +105,7 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
     }
 
     /**
-     * 审核1：岗检方案审核-HR
+     * 审核2：岗检方案审核-HR
      *
      * @param id       主键ID
      * @param statusHr 1-人力资源审批-状态：1-待审核；3-通过；4-驳回；
@@ -136,16 +136,13 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         data.setDateHr(DateUtils.getNowDate());
         data.setStatusHrUserId(SecurityUtils.getUserId());
         if (statusHr == PostPlanEnum.STATUS_HR_PASS.getValue()) {
-            data.setStatus(PostProgrammeEnum.STATUS_ING.getValue());//审核中
             data.setStep(PostProgrammeEnum.STEP_UP.getValue());
-        } else {
-            data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
         }
         return postProgrammeMapper.updatePostProgramme(data);
     }
 
     /**
-     * 审核2：岗检方案审核-Icfa
+     * 审核1：岗检方案审核-Icfa
      *
      * @param id       主键ID
      * @param statusIcfa 2-内控法务部审批-状态：1-待审核；3-通过；4-驳回；
@@ -173,8 +170,11 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
         data.setStatusIcfa(statusIcfa);
         data.setReasonIcfa(reasonIcfa);
         data.setStatus(statusIcfa);//最终审核结果
-        if (statusIcfa == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
+        if (statusIcfa == PostPlanEnum.STATUS_HR_PASS.getValue()) {
+            data.setStatus(PostProgrammeEnum.STATUS_ING.getValue());//审核中
             data.setStep(PostProgrammeEnum.STEP.getValue());
+        } else {
+            data.setStatus(PostPlanEnum.STATUS_BACK.getValue());//驳回
         }
         data.setStatusIcfaUserId(SecurityUtils.getUserId());
         data.setDateIcfa(DateUtils.getNowDate());