From 041301b24540b52908f556109ef93937aad16ae3 Mon Sep 17 00:00:00 2001
From: ls <lslvxy@163.com>
Date: Tue, 19 Nov 2024 15:35:15 +0800
Subject: [PATCH] update

---
 .../controller/ExperimentController.java      | 32 ++++++++++++++++---
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
index e8b40c1..b0f02b1 100644
--- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
+++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
@@ -1,5 +1,6 @@
 package org.jeecg.modules.database.controller;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -27,6 +28,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Description: 试验管理
@@ -67,13 +69,35 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @Operation(summary = "试验管理-分页列表查询")
     @GetMapping(value = "/list")
     //    @PermissionData(pageComponent="experiment/manage/ExperimentList")
-    public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                   HttpServletRequest req) {
+    public Result<IPage<ExperimentDTO>> queryPageList(Experiment experiment,
+                                                      @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                      @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                      HttpServletRequest req) {
         QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
         Page<Experiment> page = new Page<Experiment>(pageNo, pageSize);
         IPage<Experiment> pageList = experimentService.page(page, queryWrapper);
-        return Result.OK(pageList);
+        List<ExperimentDTO> experimentDTOList = new ArrayList<>();
+        pageList.getRecords().forEach(v -> {
+            ExperimentDTO experimentDTO = ExperimentDTO.of(v);
+            if (StringUtils.isNotBlank(v.getSupervisor())) {
+                SysUser user = userService.getById(v.getSupervisor());
+                experimentDTO.setSupervisorName(user.getRealname());
+            }
+            List<ExperimentUser> user = experimentUserService.getByExperimentId(v.getId());
+            List<ExperimentUserDTO> userDTOList;
+            if (CollUtil.isNotEmpty(user)) {
+                userDTOList = user.stream().map(ExperimentUserDTO::of).collect(Collectors.toList());
+                experimentDTO.setExperimentUserList(userDTOList);
+                experimentDTOList.add(experimentDTO);
+            }
+        });
+        Page result = new Page();
+        result.setRecords(experimentDTOList);
+        result.setCurrent(pageList.getCurrent());
+        result.setTotal(pageList.getTotal());
+        result.setPages(pageList.getPages());
+
+        return Result.OK(result);
     }
 
     /**