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 1/2] =?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); } From b5aadcbbcf809a24be611c65aee3f814ee3b5eb0 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 28 Jan 2024 19:05:01 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E9=83=A8=E9=97=A8?= =?UTF-8?q?=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- blade-service/logpm-supervise/pom.xml | 5 +++++ .../com/logpm/supervise/api/ClassifyApi.java | 8 ++++++++ .../supervise/service/IClassifyService.java | 8 +++++++- .../service/impl/ClassifyServiceImpl.java | 18 ++++++++++++++++++ 4 files changed, 38 insertions(+), 1 deletion(-) diff --git a/blade-service/logpm-supervise/pom.xml b/blade-service/logpm-supervise/pom.xml index 1bf8527df..ec903b3cf 100644 --- a/blade-service/logpm-supervise/pom.xml +++ b/blade-service/logpm-supervise/pom.xml @@ -39,6 +39,11 @@ logpm-supervise-api 3.2.0.RELEASE + + org.springblade + blade-system-api + 3.2.0.RELEASE + 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 0a6bdc898..ac3f8809d 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 @@ -84,4 +84,12 @@ public class ClassifyApi { return r; } + @GetMapping("/deptList") + @ApiOperationSupport(order = 1) + @ApiOperation(value = "我被考核的列表") + public R deptList() { + R r = classifyService.deptList(); + return r; + } + } diff --git a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java index ff3774d7f..7124048c2 100644 --- a/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java +++ b/blade-service/logpm-supervise/src/main/java/com/logpm/supervise/service/IClassifyService.java @@ -54,7 +54,6 @@ public interface IClassifyService extends BaseService { /** * 查询指标项列表 - * @param classify * @return */ List selectClassifyList(); @@ -94,4 +93,11 @@ public interface IClassifyService extends BaseService { * @return */ R beMyApiIndicators(Map params, IPage page); + + /** + * 查询部门列表 + * @return + */ + R deptList(); + } 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 27478738e..a7a906f25 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 @@ -48,6 +48,9 @@ import org.springblade.core.secure.utils.AuthUtil; import org.springblade.core.tool.api.R; import org.springblade.core.tool.utils.BeanUtil; import org.springblade.core.tool.utils.Func; +import org.springblade.system.entity.Dept; +import org.springblade.system.feign.IDeptClient; +import org.springblade.system.feign.ISysClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -78,6 +81,11 @@ public class ClassifyServiceImpl extends BaseServiceImpl userDeptNode = deptClient.getUserDeptNode(Long.parseLong(user.getDeptId())); + return R.data(userDeptNode); + } + private List getClassifyList(Long pid) { return baseMapper.selectAllClassifyList(pid); }