Compare commits

..

No commits in common. "acd4584adda588a3c20c39974d2ecc0119ae9f84" and "e3e1c2fc2b195dd442dc9e65a431ca91d66e9040" have entirely different histories.

2 changed files with 3 additions and 10 deletions

View File

@ -7,7 +7,6 @@ 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.*;
/**
@ -55,13 +54,4 @@ 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));
}
}

View File

@ -1,10 +1,12 @@
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;
@ -24,6 +26,7 @@ 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;