diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java index 34af308..ed9fc67 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java @@ -110,6 +110,28 @@ public class ExperimentUserController extends JeecgController batchAdd(@RequestBody List experimentUserList, HttpServletRequest request) { + experimentUserList.forEach(v -> { + String experimentId = v.getExperimentId(); + if (StringUtils.isBlank(experimentId)) { + throw new RuntimeException("试验数据不存在!"); + } + experimentUserService.save(v); + }); + ExperimentLog experimentLog = new ExperimentLog(); + experimentLog.setExperimentId(experimentUserList.get(0).getExperimentId()); + experimentLog.setLogContent("添加试验人员"); + String username = JwtUtil.getUserNameByToken(request); + SysUser userByName = userService.getUserByName(username); + experimentLog.setCreateBy(userByName.getRealname()); + experimentLogService.save(experimentLog); + return Result.OK("添加成功!"); + } + /** * 编辑 * @@ -194,6 +216,35 @@ public class ExperimentUserController extends JeecgController> queryByExperimentalId( + @RequestParam(name = "experimentId", required = true) String experimentalId) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(ExperimentUser::getExperimentId, experimentalId); + List list = experimentUserService.list(queryWrapper); + if (list == null) { + return Result.error("未找到对应数据"); + } + List userDTOList = new ArrayList<>(); + list.forEach(v -> { + ExperimentUserDTO userDTO = ExperimentUserDTO.of(v); + SysUser user = userService.getById(v.getUserId()); + if (Objects.nonNull(user)) { + userDTO.setUserName(user.getRealname()); + userDTOList.add(userDTO); + } + }); + return Result.OK(userDTOList); + } + /** * 通过实验id查询 *