被考核列表增加创建人字段、详情增加创建人名称

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;

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<ClassifyMapper, Classif
 
 	private final IDeptClient deptClient;
 
+	private final IUserClient userClient;
+
 
 
 
@@ -280,6 +284,10 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		//查询是否存在有附件
 		List<IndicatorsAnnexEntity> list = indicatorsAnnexService.list(Wrappers.<IndicatorsAnnexEntity>query().lambda().eq(IndicatorsAnnexEntity::getIndicatorsId, id));
 		IndicatorsVO indicatorsVO = IndicatorsWrapper.build().entityVO(indicatorsEntity);
+		R<User> userR = userClient.userInfoById(indicatorsVO.getCreateUser());
+		if (Func.isNotEmpty(userR)){
+			indicatorsVO.setCreatedUserName(userR.getData().getName());
+		}
 		if (Func.isNotEmpty(list)){
 			Map<Integer, List<IndicatorsAnnexEntity>> resourceMap = list.stream().collect(Collectors.groupingBy(IndicatorsAnnexEntity::getType));
 			if (Func.isNotEmpty(resourceMap.get(1))){
@@ -330,7 +338,13 @@ public class ClassifyServiceImpl extends BaseServiceImpl<ClassifyMapper, Classif
 		//查询我被考核的列表
 		Page<IndicatorsVO> indicatorsVOPage = indicatorsMapper.selectBeMyApiIndicators(page, params);
 		if (Func.isNotEmpty(indicatorsVOPage)){
+			for (IndicatorsVO record : indicatorsVOPage.getRecords()) {
+				//查询创建人
+				R<User> userR = userClient.userInfoById(record.getCreateUser());
+				record.setCreatedUserName(userR.getData().getName());
+			}
 			beIndicatorsVO.setIndicatorsVOS(indicatorsVOPage);
+
 		}
 		return R.data(beIndicatorsVO);
 	}