physical3/physical-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update

Browse Source
This commit is contained in:
ls
2024-11-19 15:35:15 +08:00
parent 293f584b10
commit 041301b245
1 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentController.java
View File

@@ -1,5 +1,6 @@
package org.jeecg.modules.database.controller; 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.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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 org.springframework.web.servlet.ModelAndView;
import java.util.*; import java.util.*;
import java.util.stream.Collectors;
/** /**
* @Description: 试验管理 * @Description: 试验管理
@@ -67,13 +69,35 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
@Operation(summary = "试验管理-分页列表查询") @Operation(summary = "试验管理-分页列表查询")
@GetMapping(value = "/list") @GetMapping(value = "/list")
// @PermissionData(pageComponent="experiment/manage/ExperimentList") // @PermissionData(pageComponent="experiment/manage/ExperimentList")
public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, public Result<IPage<ExperimentDTO>> queryPageList(Experiment experiment,
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
HttpServletRequest req) { @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
HttpServletRequest req) {
QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
Page<Experiment> page = new Page<Experiment>(pageNo, pageSize); Page<Experiment> page = new Page<Experiment>(pageNo, pageSize);
IPage<Experiment> pageList = experimentService.page(page, queryWrapper); 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);
} }
/** /**