Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 68a32aa05a22070c048d67ab056f40be86222450

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

@@ -2,16 +2,19 @@

import annotation.Log;
import com.ycl.platform.domain.dto.CheckScoreDTO;
import com.ycl.platform.domain.dto.CheckScoreIndexDTO;
import com.ycl.platform.domain.entity.CheckScore;
import com.ycl.platform.service.ICheckScoreService;
import com.ycl.system.AjaxResult;
import com.ycl.system.controller.BaseController;
import com.ycl.system.page.TableDataInfo;
import enumeration.BusinessType;
import jakarta.servlet.http.HttpServletResponse;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;

import java.io.IOException;
import java.util.List;
import java.util.Map;

@@ -31,11 +34,22 @@
    /**
     * 查询考核积分卡片列表
     */
    @PreAuthorize("@ss.hasPermi('check:score:list')")
    @PreAuthorize("@ss.hasPermi('check:score:query')")
    @GetMapping("/list")
    public AjaxResult list(CheckScore checkScore)
    {
        Map<Long, List<CheckScore>> deptMap = checkScoreService.selectCheckScoreList(checkScore);
        return success(deptMap);
    }

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

@@ -53,27 +67,35 @@


    /**
     * 获取考核积分详细信息
     * 获取考核指标详细信息
     */
    @PreAuthorize("@ss.hasPermi('check:score:query')")
    @GetMapping(value = "/detail/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    @PreAuthorize("@ss.hasPermi('check:score:detail')")
    @GetMapping(value = "/detail/index")
    public AjaxResult getIndex(CheckScoreIndexDTO checkScoreIndexDTO)
    {
        return success(checkScoreService.selectCheckScoreById(id));
        return success(checkScoreService.selectCheckScoreById(checkScoreIndexDTO));
    }

    /**
     * 发布考核积分
     */
    @PreAuthorize("@ss.hasPermi('check:score:edit')")
    @Log(title = "考核积分", businessType = BusinessType.UPDATE)
    @PreAuthorize("@ss.hasPermi('check:score:publish')")
    @Log(title = "发布考核积分", businessType = BusinessType.UPDATE)
    @PutMapping("/publish")
    public AjaxResult edit(@RequestBody CheckScoreDTO checkScoreDTO)
    {

        return toAjax(checkScoreService.publishCheckScore(checkScoreDTO));
    }

    /**
     * 导出考核积分列表
     */
    @PreAuthorize("@ss.hasPermi('check:score:export')")
    @Log(title = "导出考核积分", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckScore checkScore) throws IOException {
        checkScoreService.exportIndex(response,checkScore);
    }
//    /**
//     * 新增考核积分
//     */
@@ -97,16 +119,4 @@
//    }


//    /**
//     * 导出考核积分列表
//     */
//    @PreAuthorize("@ss.hasPermi('check:score:export')")
//    @Log(title = "考核积分", businessType = BusinessType.EXPORT)
//    @PostMapping("/export")
//    public void export(HttpServletResponse response, CheckScore checkScore)
//    {
//        List<CheckScore> list = checkScoreService.selectCheckScoreList(checkScore);
//        ExcelUtil<CheckScore> util = new ExcelUtil<CheckScore>(CheckScore.class);
//        util.exportExcel(response, list, "考核积分明细数据");
//    }
}