From ee66e8d405f8be3c1f66c7d14da9e2c1b5c7e9e4 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 28 Jan 2024 18:36:23 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/supervise/vo/api/BeIndicatorsVO.java | 3 ++- .../src/main/java/com/logpm/supervise/api/ClassifyApi.java | 7 ------- .../logpm/supervise/service/impl/ClassifyServiceImpl.java | 4 +--- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java index 450ef1ee2..cd346f78c 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/api/BeIndicatorsVO.java @@ -1,5 +1,6 @@ package com.logpm.supervise.vo.api; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.logpm.supervise.entity.IndicatorsAnnexEntity; import com.logpm.supervise.entity.IndicatorsEntity; import com.logpm.supervise.vo.IndicatorsVO; @@ -20,7 +21,7 @@ public class BeIndicatorsVO { //扣分 private Integer deductionPoints; - private List indicatorsVOS; + private Page indicatorsVOS; } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java index b55cb4340..0a6bdc898 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/api/ClassifyApi.java @@ -75,13 +75,6 @@ public class ClassifyApi { return r; } - - - - - - - @GetMapping("/beMyApiIndicators") @ApiOperationSupport(order = 1) @ApiOperation(value = "我被考核的列表") diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java index 28a19abf1..27478738e 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/impl/ClassifyServiceImpl.java @@ -322,10 +322,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params); if (Func.isNotEmpty(indicatorsVOPage)){ - - beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage.getRecords()); + beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage); } - return R.data(beIndicatorsVO); }