fuliqi
2024-04-11 5a106c938e39d1f82339c122c547434c3d6a5685
分页插件依赖更换
8个文件已修改
49 ■■■■■ 已修改文件
pom.xml 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java 8 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
pom.xml
@@ -31,7 +31,7 @@
        <fastjson.version>2.0.43</fastjson.version>
        <commons.lang.version>2.6</commons.lang.version>
        <druid.version>1.2.20</druid.version>
        <pagehelper.version>1.3.0</pagehelper.version>
        <pagehelper.boot.version>1.4.6</pagehelper.boot.version>
        <aliyun.sdk.oss.version>3.10.2</aliyun.sdk.oss.version>
        <knife4j.version>3.0.2</knife4j.version>
        <aspectj.version>1.9.4</aspectj.version>
@@ -171,14 +171,19 @@
            <version>${druid.version}</version>
        </dependency>
        <!-- pagehelper 分页插件 -->
        <dependency>
            <groupId>com.github.pagehelper</groupId>
            <artifactId>pagehelper-spring-boot-starter</artifactId>
            <version>${pagehelper.version}</version>
            <version>${pagehelper.boot.version}</version>
            <exclusions>
                <exclusion>
                    <artifactId>jsqlparser</artifactId>
                    <groupId>com.github.jsqlparser</groupId>
                    <groupId>org.mybatis</groupId>
                    <artifactId>mybatis</artifactId>
                </exclusion>
                <exclusion>
                    <groupId>org.mybatis</groupId>
                    <artifactId>mybatis-spring</artifactId>
                </exclusion>
            </exclusions>
        </dependency>
ycl-server/src/main/java/com/ycl/platform/controller/CalculateRecordController.java
@@ -31,7 +31,7 @@
    /**
     * 查询核算记录列表
     */
    @PreAuthorize("@ss.hasPermi('system:record:list')")
//    @PreAuthorize("@ss.hasPermi('system:record:list')")
    @GetMapping("/list")
    public TableDataInfo list(CalculateRecord calculateRecord)
    {
@@ -43,7 +43,7 @@
    /**
     * 导出核算记录列表
     */
    @PreAuthorize("@ss.hasPermi('system:record:export')")
//    @PreAuthorize("@ss.hasPermi('system:record:export')")
    @Log(title = "核算记录", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CalculateRecord calculateRecord)
@@ -56,7 +56,7 @@
    /**
     * 获取核算记录详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:record:query')")
//    @PreAuthorize("@ss.hasPermi('system:record:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
ycl-server/src/main/java/com/ycl/platform/controller/CalculateRuleController.java
@@ -30,7 +30,7 @@
    /**
     * 查询核算规则列表
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:list')")
//    @PreAuthorize("@ss.hasPermi('calculate:rule:list')")
    @GetMapping("/list")
    public AjaxResult list(CalculateRule calculateRule)
    {
@@ -54,7 +54,7 @@
    /**
     * 获取核算规则详细信息
     */
    @PreAuthorize("@ss.hasPermi('calculate:rule:query')")
//    @PreAuthorize("@ss.hasPermi('calculate:rule:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
ycl-server/src/main/java/com/ycl/platform/controller/CheckPublishController.java
@@ -32,7 +32,7 @@
    /**
     * 查询考核发布列表
     */
    @PreAuthorize("@ss.hasPermi('system:publish:list')")
//    @PreAuthorize("@ss.hasPermi('system:publish:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckPublish checkPublish)
    {
@@ -57,7 +57,7 @@
    /**
     * 获取考核发布详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:publish:query')")
//    @PreAuthorize("@ss.hasPermi('system:publish:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -67,7 +67,7 @@
    /**
     * 新增考核发布
     */
    @PreAuthorize("@ss.hasPermi('system:publish:add')")
//    @PreAuthorize("@ss.hasPermi('system:publish:add')")
    @Log(title = "考核发布", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CheckPublish checkPublish)
ycl-server/src/main/java/com/ycl/platform/controller/CheckResultController.java
@@ -31,7 +31,7 @@
    /**
     * 查询考核结果列表
     */
    @PreAuthorize("@ss.hasPermi('system:result:list')")
//    @PreAuthorize("@ss.hasPermi('system:result:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckResult checkResult)
    {
@@ -56,7 +56,7 @@
    /**
     * 获取考核结果详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:result:query')")
//    @PreAuthorize("@ss.hasPermi('system:result:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
ycl-server/src/main/java/com/ycl/platform/controller/CheckRuleController.java
@@ -34,7 +34,7 @@
    /**
     * 查询考核规则列表
     */
    @PreAuthorize("@ss.hasPermi('system:rule:list')")
//    @PreAuthorize("@ss.hasPermi('system:rule:list')")
    @PostMapping("/list")
    public TableDataInfo list(@RequestBody CheckRuleQuery checkRuleQuery)
    {
@@ -59,7 +59,7 @@
    /**
     * 获取考核规则详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:rule:query')")
//    @PreAuthorize("@ss.hasPermi('system:rule:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
ycl-server/src/main/java/com/ycl/platform/controller/CheckScoreController.java
@@ -31,7 +31,7 @@
    /**
     * 查询考核积分明细列表
     */
    @PreAuthorize("@ss.hasPermi('system:score:list')")
//    @PreAuthorize("@ss.hasPermi('system:score:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckScore checkScore)
    {
@@ -56,7 +56,7 @@
    /**
     * 获取考核积分明细详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:score:query')")
//    @PreAuthorize("@ss.hasPermi('system:score:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
ycl-server/src/main/java/com/ycl/platform/controller/CheckTemplateController.java
@@ -34,7 +34,7 @@
    /**
     * 查询考核模板列表
     */
    @PreAuthorize("@ss.hasPermi('system:template:list')")
//    @PreAuthorize("@ss.hasPermi('system:template:list')")
    @GetMapping("/list")
    public TableDataInfo list(CheckTemplateQuery checkTemplateDTO)
    {
@@ -46,7 +46,7 @@
    /**
     * 导出考核模板列表
     */
    @PreAuthorize("@ss.hasPermi('system:template:export')")
//    @PreAuthorize("@ss.hasPermi('system:template:export')")
    @Log(title = "考核模板", businessType = BusinessType.EXPORT)
    @PostMapping("/export")
    public void export(HttpServletResponse response, CheckTemplateQuery checkTemplateDTO)
@@ -59,7 +59,7 @@
    /**
     * 获取考核模板详细信息
     */
    @PreAuthorize("@ss.hasPermi('system:template:query')")
//    @PreAuthorize("@ss.hasPermi('system:template:query')")
    @GetMapping(value = "/{id}")
    public AjaxResult getInfo(@PathVariable("id") Long id)
    {
@@ -69,7 +69,7 @@
    /**
     * 新增考核模板
     */
    @PreAuthorize("@ss.hasPermi('system:template:add')")
//    @PreAuthorize("@ss.hasPermi('system:template:add')")
    @Log(title = "考核模板", businessType = BusinessType.INSERT)
    @PostMapping
    public AjaxResult add(@RequestBody CheckTemplateQuery checkTemplateDTO)