Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 68a32aa05a22070c048d67ab056f40be86222450

 ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java

@@ -8,7 +8,6 @@
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import com.ycl.utils.poi.ExcelUtil;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
@@ -35,7 +34,7 @@
    /**
     * 查询考核积分卡片列表
     */
//    @PreAuthorize("@ss.hasPermi('check:score:list')")
    @PreAuthorize("@ss.hasPermi('check:score:query')")
    @GetMapping("/list")
    public AjaxResult list(CheckScore checkScore)
    {
@@ -44,9 +43,20 @@
    }

    /**
     * 查询考核积分折线图
     */
    @PreAuthorize("@ss.hasPermi('check:score:chart')")
    @GetMapping("/chart")
    public AjaxResult selectCheckScoreChart(CheckScore checkScore)
    {
        Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreChart(checkScore);
        return success(deptMap);
    }

    /**
     * 区县详情列表
     */
//    @PreAuthorize("@ss.hasPermi('check:score:list')")
    @PreAuthorize("@ss.hasPermi('check:score:list')")
    @GetMapping("/detail")
    public TableDataInfo detail(CheckScore checkScore)
    {
@@ -59,18 +69,17 @@
    /**
     * 获取考核指标详细信息
     */
//    @PreAuthorize("@ss.hasPermi('check:score:query')")
    @PreAuthorize("@ss.hasPermi('check:score:detail')")
    @GetMapping(value = "/detail/index")
    public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
    {

        return success(checkScoreService.selectCheckScoreById(checkScoreIndexDTO));
    }

    /**
     * 发布考核积分
     */
//    @PreAuthorize("@ss.hasPermi('check:score:edit')")
    @PreAuthorize("@ss.hasPermi('check:score:publish')")
    @Log(title = "发布考核积分", businessType = BusinessType.UPDATE)
    @PutMapping("/publish")
    public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO)
@@ -81,7 +90,7 @@
    /**
     * 导出考核积分列表
     */
//    @PreAuthorize("@ss.hasPermi('check:score:export')")
    @PreAuthorize("@ss.hasPermi('check:score:export')")
    @Log(title = "导出考核积分", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {