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

@@ -6,6 +6,7 @@ import java.util.Optional;
 import javax.servlet.http.HttpServletResponse;
 
 import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.constant.PostPlanEnum;
 import com.ruoyi.common.constant.PostProgrammeEnum;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
@@ -214,10 +215,15 @@ public class PostProgrammeController extends BaseController {
         // 判断当前状态
         PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
         // 审核过得不在审核
-
-        if (postProgramme.getStatusHr() == PostProgrammeEnum.STATUS_HR_PASS.getValue()) {
-            return AjaxResult.error("审核失败，请勿重复审核！");
+        if (postProgramme.getStatusHr() == PostPlanEnum.STATUS_HR_PASS.getValue()) {
+            return AjaxResult.error( "审核失败，请勿重复审核！");
+        }
+        // 判断顺序
+        if (postProgramme.getStatusIcfa() != PostPlanEnum.STATUS_ICFA_PASS.getValue()
+                && postProgramme.getStatus() != PostPlanEnum.STATUS_ING.getValue()) {
+            return AjaxResult.error(HttpStatus.WARN,"审核失败，审核流程有误！！");
         }
+
         // 当前登录用户的部门id 查询岗位id是否在内
         SysDept sysDept = sysDeptService.selectDeptById(loginUser.getDeptId());
         if (!sysDept.getDeptCode().equals(DeptCode.DEPT_HR.getCode())) {
@@ -247,12 +253,7 @@ public class PostProgrammeController extends BaseController {
         // 判断当前状态
         PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
         // 审核过得不在审核
-        if (postProgramme.getStatusHr() != PostProgrammeEnum.STATUS_PASS.getValue()
-                && postProgramme.getStatus() == PostProgrammeEnum.STATUS_ING.getValue()) {
-            return AjaxResult.error(HttpStatus.WARN,"审核失败，审核流程有误！！");
-        }
-
-        if (postProgramme.getStatusIcfa() == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
+        if (postProgramme.getStatusIcfa() == PostPlanEnum.STATUS_ICFA_PASS.getValue()) {
             return AjaxResult.error("审核失败，请勿重复审核！");
         }
 

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

@@ -66,7 +66,7 @@ public class PostProgrammeServiceImpl extends ServiceImpl<PostProgrammeMapper, P
 
         postProgramme.setSubmitDate(new Date());//提交日期
         postProgramme.setStatus(PostProgrammeEnum.STATUS_WAIT.getValue());//状态：1-待审核；2-审核中；3-通过；4-驳回；
-        postProgramme.setStatusHr(PostProgrammeEnum.STATUS_HR_WAIT.getValue());//状态：1-人力资源审批-状态：1-待审核；3-通过；4-驳回；
+        postProgramme.setStatusIcfa(PostProgrammeEnum.STATUS_ICFA_WAIT.getValue());//状态：1-内控法务审核审批-状态：1-待审核；3-通过；4-驳回；
         return postProgrammeMapper.insertPostProgramme(postProgramme);
     }