From f1c0567924cf5e268aaf536606af7b185f708847 Mon Sep 17 00:00:00 2001 From: PigBaoBei <2739175034@qq.com> Date: Sun, 28 Jan 2024 20:46:43 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A2=AB=E8=80=83=E6=A0=B8=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA=E4=BA=BA=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E3=80=81=E8=AF=A6=E6=83=85=E5=A2=9E=E5=8A=A0=E5=88=9B=E5=BB=BA?= =?UTF-8?q?=E4=BA=BA=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/logpm/supervise/vo/IndicatorsVO.java | 2 ++ .../service/impl/ClassifyServiceImpl.java | 14 ++++++++++++++ 2 files changed, 16 insertions(+) diff --git a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java index b490767ad..8022a430d 100644 --- a/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java +++ b/blade-service-api/logpm-supervise-api/src/main/java/com/logpm/supervise/vo/IndicatorsVO.java @@ -17,6 +17,8 @@ public class IndicatorsVO extends IndicatorsEntity { private Long parentClassifyId; + private String createdUserName; + private Integer bonusPoin; private Integer deductionPoints; 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 a7a906f25..f42b91afd 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 @@ -49,8 +49,10 @@ 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.entity.User; import org.springblade.system.feign.IDeptClient; import org.springblade.system.feign.ISysClient; +import org.springblade.system.feign.IUserClient; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -83,6 +85,8 @@ public class ClassifyServiceImpl extends BaseServiceImpl list = indicatorsAnnexService.list(Wrappers.query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id)); IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity); + R userR = userClient.userInfoById(indicatorsVO.getCreateUser()); + if (Func.isNotEmpty(userR)){ + indicatorsVO.setCreatedUserName(userR.getData().getName()); + } if (Func.isNotEmpty(list)){ Map> resourceMap = list.stream().collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType)); if (Func.isNotEmpty(resourceMap.get(1))){ @@ -330,7 +338,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params); if (Func.isNotEmpty(indicatorsVOPage)){ + for (IndicatorsVO record : indicatorsVOPage.getRecords()) { + //查询创建人 + R userR = userClient.userInfoById(record.getCreateUser()); + record.setCreatedUserName(userR.getData().getName()); + } beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage); + } return R.data(beIndicatorsVO); }