优化提示

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

@@ -5,6 +5,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.ruoyi.common.constant.HttpStatus;
+import com.ruoyi.common.constant.PostPlanEnum;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeptCode;
@@ -221,8 +222,8 @@ public class PostPlanController extends BaseController {
         // 判断当前状态
         PostPlan postPlan = postPlanService.selectPostPlanById(id);
         // 审核过得不在审核
-        if (postPlan.getStatusIcfa() == 3) {
-            return AjaxResult.error(HttpStatus.SUCCESS,"审核失败，请勿重复审核！");
+        if (postPlan.getStatusIcfa() == PostPlanEnum.STATUS_ICFA_PASS.getValue()) {
+            return AjaxResult.error("审核失败，请勿重复审核！");
         }
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -255,12 +256,13 @@ public class PostPlanController extends BaseController {
         // 判断当前状态
         PostPlan postPlan = postPlanService.selectPostPlanById(id);
         // 审核过得不在审核
-        if (postPlan.getStatusHr() == 3) {
-            return AjaxResult.error(HttpStatus.SUCCESS, "审核失败，请勿重复审核！");
+        if (postPlan.getStatusHr() == PostPlanEnum.STATUS_HR_PASS.getValue()) {
+            return AjaxResult.error( "审核失败，请勿重复审核！");
         }
         // 判断顺序
-        if (postPlan.getStatusIcfa() != 3) {
-            return AjaxResult.error(HttpStatus.SUCCESS,"审核失败，审核流程有误！！");
+        if (postPlan.getStatusIcfa() != PostPlanEnum.STATUS_ICFA_PASS.getValue()
+                && postPlan.getStatus() != PostPlanEnum.STATUS_ING.getValue()) {
+            return AjaxResult.error(HttpStatus.WARN,"审核失败，审核流程有误！！");
         }
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();

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.PostProgrammeEnum;
 import com.ruoyi.common.core.domain.entity.SysDept;
 import com.ruoyi.common.core.domain.model.LoginUser;
 import com.ruoyi.common.enums.DeptCode;
@@ -209,8 +210,8 @@ public class PostProgrammeController extends BaseController {
         PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
         // 审核过得不在审核
 
-        if (postProgramme.getStatusHr() == 3) {
-            return AjaxResult.error(HttpStatus.SUCCESS, "审核失败，请勿重复审核！");
+        if (postProgramme.getStatusHr() == PostProgrammeEnum.STATUS_HR_PASS.getValue()) {
+            return AjaxResult.error("审核失败，请勿重复审核！");
         }
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();
@@ -241,12 +242,13 @@ public class PostProgrammeController extends BaseController {
         // 判断当前状态
         PostProgramme postProgramme = postProgrammeService.selectPostProgrammeById(id);
         // 审核过得不在审核
-        if (postProgramme.getStatusHr() != 3) {
-            return AjaxResult.error(HttpStatus.SUCCESS,"审核失败，审核流程有误！！");
+        if (postProgramme.getStatusHr() != PostProgrammeEnum.STATUS_PASS.getValue()
+                && postProgramme.getStatus() == PostProgrammeEnum.STATUS_ING.getValue()) {
+            return AjaxResult.error(HttpStatus.WARN,"审核失败，审核流程有误！！");
         }
 
-        if (postProgramme.getStatusIcfa() == 3) {
-            return AjaxResult.error(HttpStatus.SUCCESS,"审核失败，请勿重复审核！");
+        if (postProgramme.getStatusIcfa() == PostProgrammeEnum.STATUS_ICFA_PASS.getValue()) {
+            return AjaxResult.error("审核失败，请勿重复审核！");
         }
         // 判断审核的权限
         LoginUser loginUser = SecurityUtils.getLoginUser();