提交代码

ruoyi-wechat/src/main/java/com/ruoyi/web/project/ProjectCheckingController.java

@@ -7,6 +7,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.yanzhu.jh.project.domain.SurProjectChecking;
 import com.yanzhu.jh.project.service.ISurProjectCheckingService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
 /**
@@ -54,4 +55,13 @@ public class ProjectCheckingController extends BaseController {
         return success(surProjectCheckingService.insertSurProjectChecking(surProjectChecking));
     }
 
+    /**
+     * 删除举牌验收
+     */
+    @Log(title = "举牌验收", businessType = BusinessType.DELETE)
+    @GetMapping("/remove")
+    public AjaxResult remove(@RequestParam Long id)
+    {
+        return toAjax(surProjectCheckingService.deleteSurProjectCheckingById(id));
+    }
 }

yanzhu-bigscreen/src/main/java/com/yanzhu/jh/bigscreen/web/controller/ProjectQuarterlyAssessController.java

@@ -1,12 +1,10 @@
 package com.yanzhu.jh.bigscreen.web.controller;
 
-import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.constant.Constants;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.core.redis.RedisCache;
-import com.ruoyi.common.enums.BusinessType;
 import com.yanzhu.jh.project.domain.SmzProjectQuarterlyAssess;
 import com.yanzhu.jh.project.service.ISmzProjectQuarterlyAssessService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -26,7 +24,6 @@ public class ProjectQuarterlyAssessController extends BaseController {
     private RedisCache redisCache;
 
 
-    @Log(title = "按部门获取当前季度考核目标", businessType = BusinessType.INSERT)
     @GetMapping("/currentListByDept")
     public TableDataInfo currentListByDept(Long deptId){
         String key="bgscreen_asscess_currentListByDept"+deptId;