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/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 5b23ce2c9..5437e2e4b 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 @@ -76,13 +76,6 @@ public class ClassifyApi { return r; } - - - - - - - @GetMapping("/beMyApiIndicators") @ApiOperationSupport(order = 1) @ApiOperation(value = "我被考核的列表") @@ -92,4 +85,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 28a19abf1..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 indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params); if (Func.isNotEmpty(indicatorsVOPage)){ - - beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage.getRecords()); + beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage); } - return R.data(beIndicatorsVO); } + /** + * @return + */ + @Override + public R deptList() { + BladeUser user = AuthUtil.getUser(); + List userDeptNode = deptClient.getUserDeptNode(Long.parseLong(user.getDeptId())); + return R.data(userDeptNode); + } + private List getClassifyList(Long pid) { return baseMapper.selectAllClassifyList(pid); }