形象店审增加创建人与更新人名

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/imageStore/controller/BladeImageStoreApplyController.java

@@ -19,7 +19,9 @@ package com.gubersail.admin.imageStore.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.gubersail.admin.imageStore.service.IBladeImageStoreApplyService;
+import com.gubersail.dealer.admin.api.imageStore.dto.BladeImageStoreApplyDTO;
 import com.gubersail.dealer.admin.api.imageStore.entity.BladeImageStoreApply;
 import com.gubersail.dealer.admin.api.imageStore.vo.BladeImageStoreApplyVO;
 import io.swagger.annotations.Api;
@@ -30,10 +32,17 @@ import org.springblade.core.boot.ctrl.BladeController;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 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.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
+import java.util.*;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 /**
  * 形象店申请主表 控制器
@@ -49,6 +58,8 @@ public class BladeImageStoreApplyController extends BladeController {
 
 	private final IBladeImageStoreApplyService bladeImageStoreApplyService;
 
+	private final IUserClient userClient;
+
 	/**
 	 * 详情
 	 */
@@ -62,7 +73,7 @@ public class BladeImageStoreApplyController extends BladeController {
 	 * 分页 形象店申请主表
 	 */
 	@GetMapping("/list")
-	public R<IPage<BladeImageStoreApply>> list(BladeImageStoreApplyVO bladeImageStoreApply, Query query) {
+	public R<IPage<BladeImageStoreApplyVO>> list(BladeImageStoreApplyVO bladeImageStoreApply, Query query) {
 		LambdaQueryWrapper<BladeImageStoreApply> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(BladeImageStoreApply::getIsDeleted, 0)
 			.like(ObjectUtils.isNotNull(bladeImageStoreApply.getApplyNo()), BladeImageStoreApply::getApplyNo, bladeImageStoreApply.getApplyNo())
@@ -79,7 +90,25 @@ public class BladeImageStoreApplyController extends BladeController {
 			.eq(ObjectUtils.isNotNull(bladeImageStoreApply.getAuditStatus()), BladeImageStoreApply::getAuditStatus, bladeImageStoreApply.getAuditStatus())
 			.orderByDesc(BladeImageStoreApply::getCreateTime);
 		IPage<BladeImageStoreApply> pages = bladeImageStoreApplyService.page(Condition.getPage(query), lambdaQueryWrapper);
-		return R.data(pages);
+		IPage<BladeImageStoreApplyVO> pagesDTO = new Page<>();
+		pagesDTO.setCurrent(pages.getCurrent());
+		pagesDTO.setSize(pages.getSize());
+		pagesDTO.setTotal(pages.getTotal());
+		if (CollectionUtils.isEmpty(pages.getRecords())) {
+			pagesDTO.setRecords(Collections.EMPTY_LIST);
+			return R.data(pagesDTO);
+		}
+		List<BladeImageStoreApplyVO> pageDtoList = BeanUtil.copyProperties(pages.getRecords(), BladeImageStoreApplyVO.class);
+		pagesDTO.setRecords(pageDtoList);
+		List<Long> userIds = pageDtoList.stream().flatMap(e -> Stream.of(e.getCreateUser(), e.getUpdateUser())).filter(Objects::nonNull).distinct().collect(Collectors.toList());
+		List<User> userList = userClient.userListGetByIds(userIds);
+		pageDtoList.forEach(item -> {
+			if (!userList.isEmpty()) {
+				userList.stream().filter(user -> Objects.equals(user.getId(), item.getCreateUser())).findFirst().ifPresent(user -> item.setCreateUserName(user.getRealName()));
+				userList.stream().filter(user -> Objects.equals(user.getId(), item.getUpdateUser())).findFirst().ifPresent(user -> item.setUpdateUserName(user.getRealName()));
+			}
+		});
+		return R.data(pagesDTO);
 	}
 
 	/**