Merge branch 'master' of http://192.168.101.10:13000/gogs/zhaoshangyinzi

ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BmProjectController.java

@@ -134,6 +134,17 @@ public class BmProjectController extends BaseController {
         return bmProjectService.examine(bmProjectStatus);
     }
 
+    /**
+     * 撤销审核
+     * @param bmProjectStatus
+     * @return
+     */
+    @PreAuthorize("@ss.hasPermi('bmProject:project:back')")
+    @PostMapping("/back")
+    public AjaxResult back(@RequestBody BmProjectStatus bmProjectStatus) {
+        return bmProjectService.examine(bmProjectStatus);
+    }
+
     /**
      * 首页查询待审核列表
      */

ruoyi-common/src/main/java/com/ruoyi/common/constant/Constants.java

@@ -141,6 +141,11 @@ public class Constants
      */
     public static final Long EXAMINE_PASS = 3L;
 
+    /**
+     * 撤销审核
+     */
+    public static final Long EXAMINE_FOUR = 4L;
+
     /**
      * 判断是否等于5的标志
      */

ruoyi-system/src/main/java/com/ruoyi/system/domain/project/BmProjectStatus.java

@@ -10,7 +10,7 @@ public class BmProjectStatus {
     private static final long serialVersionUID = 1L;
 
     /**
-     * 1:提交审核 2:审核驳回 3:审核通过
+     * 1:提交审核 2:审核驳回 3:审核通过 4:撤销审核
      */
     private Long code;
 

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/project/BmProjectServiceImpl.java

@@ -192,6 +192,9 @@ public class BmProjectServiceImpl implements IBmProjectService {
             } else if ((projectStatus & 1) == 1 && code.equals(EXAMINE_PASS)) {
                 //是奇数并且还是审核通过
                 return AjaxResult.error("当前已审核通过");
+            }else if ((projectStatus & 1) == 0 && code.equals(EXAMINE_FOUR)) {
+                //是偶数并且撤回审核
+                return AjaxResult.error("当前正在等待审核,如需撤销请管理员驳回");
             }
 
             //如果是提交审核判断相应信息是否填写
@@ -251,7 +254,7 @@ public class BmProjectServiceImpl implements IBmProjectService {
                 return AjaxResult.error("当前项目已结束,无法继续操作");
             }
             //判断是否是提交审核/通过审核
-            projectStatus = !code.equals(EXAMINE_BACK) ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
+            projectStatus = (code & 1) == 0 ? projectStatus + EXAMINE_COMMIT : projectStatus - EXAMINE_COMMIT;
             if (projectStatus < EXAMINE_COMMIT) {
                 projectStatus = EXAMINE_COMMIT;
             }