update

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -87,7 +88,9 @@ public class ExperimentAnnealProcessController extends JeecgController<Experimen
     public Result<String> add(@RequestBody ExperimentAnnealProcess experimentAnnealProcess, HttpServletRequest request) {
         experimentAnnealProcessService.save(experimentAnnealProcess);
         String experimentId = experimentAnnealProcess.getExperimentId();
-
+        if (StringUtils.isBlank(experimentId)) {
+            return Result.error("试验数据不存在！");
+        }
         Experiment experiment = new Experiment();
         experiment.setId(experimentId);
         experiment.setStatus(ExperimentStatus.PROGRESSING);

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

@@ -8,6 +8,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -15,6 +16,8 @@ import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.constant.ExperimentStatus;
+import org.jeecg.modules.database.dto.ExperimentDTO;
+import org.jeecg.modules.database.dto.ExperimentUserDTO;
 import org.jeecg.modules.database.entity.*;
 import org.jeecg.modules.database.service.*;
 import org.jeecg.modules.system.entity.SysUser;
@@ -23,8 +26,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.Arrays;
+import java.util.*;
-import java.util.Objects;
 
 /**
  * @Description: 试验管理
@@ -49,6 +51,8 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     private IExperimentTestProcessService      experimentTestProcessService;
     @Autowired
     private ISysUserService                    userService;
+    @Autowired
+    private IExperimentUserService             experimentUserService;
 
     /**
      * 分页列表查询
@@ -63,8 +67,7 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @Operation(summary = "试验管理-分页列表查询")
     @GetMapping(value = "/list")
     //    @PermissionData(pageComponent="experiment/manage/ExperimentList")
-    public Result<IPage<Experiment>> queryPageList(Experiment experiment,
+    public Result<IPage<Experiment>> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
         QueryWrapper<Experiment> queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap());
@@ -83,11 +86,25 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     @Operation(summary = "试验管理-添加")
     @RequiresPermissions("database:experiment:add")
     @PostMapping(value = "/add")
-    public Result<String> add(@RequestBody Experiment experiment, HttpServletRequest request) {
+    public Result<String> add(@RequestBody ExperimentDTO experiment, HttpServletRequest request) {
-        experiment.setStatus(ExperimentStatus.PRE_TEST);
+        Experiment experimentDomain = ExperimentDTO.to(experiment);
-        experimentService.save(experiment);
+        experimentDomain.setStatus(ExperimentStatus.PRE_TEST);
+        experimentService.save(experimentDomain);
+
+        String experimentUser = experiment.getExperimentUser();
+        if (StringUtils.isNotBlank(experimentUser)) {
+            for (String userId : experimentUser.split(",")) {
+                ExperimentUser userDomain = new ExperimentUser();
+                userDomain.setExperimentId(experimentDomain.getId());
+                userDomain.setUserId(userId);
+                userDomain.setType("OPERATOR");
+                experimentUserService.save(userDomain);
+            }
+
+        }
+
         ExperimentLog experimentLog = new ExperimentLog();
-        experimentLog.setExperimentId(experiment.getId());
+        experimentLog.setExperimentId(experimentDomain.getId());
         experimentLog.setLogContent("新建实验");
         String username = JwtUtil.getUserNameByToken(request);
         SysUser userByName = userService.getUserByName(username);
@@ -190,12 +207,28 @@ public class ExperimentController extends JeecgController<Experiment, IExperimen
     //@AutoLog(value = "试验管理-通过id查询")
     @Operation(summary = "试验管理-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<Experiment> queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result<ExperimentDTO> queryById(@RequestParam(name = "id", required = true) String id) {
         Experiment experiment = experimentService.getById(id);
         if (experiment == null) {
             return Result.error("未找到对应数据");
         }
-        return Result.OK(experiment);
+        ExperimentDTO dto = ExperimentDTO.of(experiment);
+        if (StringUtils.isNotBlank(dto.getSupervisor())) {
+            SysUser user = userService.getById(dto.getSupervisor());
+            dto.setSupervisorName(user.getRealname());
+        }
+        List<ExperimentUser> userList = experimentUserService.getByExperimentId(dto.getId());
+        List<ExperimentUserDTO> userDTOList = new ArrayList<>();
+        for (ExperimentUser v : userList) {
+            ExperimentUserDTO userDTO = ExperimentUserDTO.of(v);
+            SysUser user = userService.getById(v.getUserId());
+            if (Objects.nonNull(user)) {
+                userDTO.setUserName(user.getRealname());
+                userDTOList.add(userDTO);
+            }
+        }
+        dto.setExperimentUserList(userDTOList);
+        return Result.OK(dto);
     }
 
     /**

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -17,9 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.constant.ExperimentStatus;
 import org.jeecg.modules.database.entity.*;
-import org.jeecg.modules.database.service.IExperimentLogService;
+import org.jeecg.modules.database.service.*;
-import org.jeecg.modules.database.service.IExperimentRadiationProcessService;
-import org.jeecg.modules.database.service.IExperimentService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,7 +44,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
     @Autowired
     private IExperimentLogService experimentLogService;
     @Autowired
-    private ISysUserService userService;
+    private ISysUserService       userService;
 
     @Autowired
     private IExperimentService experimentService;
@@ -66,7 +65,8 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
                                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                                    @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                                    HttpServletRequest req) {
-        QueryWrapper<ExperimentRadiationProcess> queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess, req.getParameterMap());
+        QueryWrapper<ExperimentRadiationProcess> queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess,
+                req.getParameterMap());
         Page<ExperimentRadiationProcess> page = new Page<ExperimentRadiationProcess>(pageNo, pageSize);
         IPage<ExperimentRadiationProcess> pageList = experimentRadiationProcessService.page(page, queryWrapper);
         return Result.OK(pageList);
@@ -85,6 +85,9 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
     public Result<String> add(@RequestBody ExperimentRadiationProcess experimentRadiationProcess, HttpServletRequest request) {
         experimentRadiationProcessService.save(experimentRadiationProcess);
         String experimentId = experimentRadiationProcess.getExperimentId();
+        if (StringUtils.isBlank(experimentId)) {
+            return Result.error("试验数据不存在！");
+        }
         Experiment experiment = new Experiment();
         experiment.setId(experimentId);
         experiment.setStatus(ExperimentStatus.PROGRESSING);
@@ -180,6 +183,7 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
         }
         return Result.OK(experimentRadiationProcess);
     }
+
     /**
      * 通过实验id查询
      *
@@ -189,7 +193,8 @@ public class ExperimentRadiationProcessController extends JeecgController<Experi
     //@AutoLog(value = "试验评定-通过id查询")
     @Operation(summary = "辐照过程-通过实验ID查询")
     @GetMapping(value = "/queryByExperimentId")
-    public Result<ExperimentRadiationProcess> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+    public Result<ExperimentRadiationProcess> queryByExperimentalId(
+            @RequestParam(name = "experimentId", required = true) String experimentalId) {
         LambdaQueryWrapper<ExperimentRadiationProcess> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ExperimentRadiationProcess::getExperimentId, experimentalId);
         ExperimentRadiationProcess experimentReview = experimentRadiationProcessService.getOne(queryWrapper);

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRatingController.java

@@ -9,12 +9,13 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
-import org.jeecg.modules.database.ExperimentRatingDTO;
+import org.jeecg.modules.database.dto.ExperimentRatingDTO;
 import org.jeecg.modules.database.entity.Experiment;
 import org.jeecg.modules.database.entity.ExperimentRating;
 import org.jeecg.modules.database.service.IExperimentRatingService;
@@ -90,6 +91,10 @@ public class ExperimentRatingController extends JeecgController<ExperimentRating
     @RequiresPermissions("database:experiment_rating:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ExperimentRating experimentRating) {
+        String experimentId = experimentRating.getExperimentId();
+        if (StringUtils.isBlank(experimentId)) {
+            return Result.error("试验数据不存在！");
+        }
         experimentRatingService.save(experimentRating);
         return Result.OK("添加成功！");
     }

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java

@@ -1,5 +1,6 @@
 package org.jeecg.modules.database.controller;
 
+import cn.hutool.core.util.ObjUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -18,7 +19,8 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.util.oConvertUtils;
 import org.jeecg.modules.database.constant.ExperimentStatus;
-import org.jeecg.modules.database.entity.*;
+import org.jeecg.modules.database.entity.Experiment;
+import org.jeecg.modules.database.entity.ExperimentReport;
 import org.jeecg.modules.database.service.IExperimentReportService;
 import org.jeecg.modules.database.service.IExperimentService;
 import org.jeecg.modules.system.entity.SysUser;
@@ -44,7 +46,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
     @Autowired
     private IExperimentReportService experimentReportService;
     @Autowired
-    private IExperimentService experimentService;
+    private IExperimentService       experimentService;
 
     @Autowired
     private ISysUserService sysUserService;
@@ -61,7 +63,10 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
     //@AutoLog(value = "试验报告-分页列表查询")
     @Operation(summary = "试验报告-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<ExperimentReport>> queryPageList(ExperimentReport experimentReport, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
+    public Result<IPage<ExperimentReport>> queryPageList(ExperimentReport experimentReport,
+                                                         @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                         @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                         HttpServletRequest req) {
         QueryWrapper<ExperimentReport> queryWrapper = QueryGenerator.initQueryWrapper(experimentReport, req.getParameterMap());
         Page<ExperimentReport> page = new Page<ExperimentReport>(pageNo, pageSize);
         IPage<ExperimentReport> pageList = experimentReportService.page(page, queryWrapper);
@@ -79,6 +84,15 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
     @RequiresPermissions("database:experiment_report:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ExperimentReport experimentReport) {
+        String experimentId = experimentReport.getExperimentId();
+        if (StringUtils.isBlank(experimentId)) {
+            return Result.error("试验数据不存在！");
+        }
+        Experiment experiment = experimentService.getById(experimentId);
+        if (ObjUtil.isNull(experiment)) {
+            return Result.error("试验数据不存在！");
+        }
+        experimentReport.setReportName(experiment.getName() + "-试验报告");
         experimentReportService.save(experimentReport);
         return Result.OK("添加成功！");
     }
@@ -153,6 +167,7 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         }
         return Result.OK(experimentReport);
     }
+
     /**
      * 通过实验id查询
      *
@@ -162,7 +177,8 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
     //@AutoLog(value = "试验评定-通过id查询")
     @Operation(summary = "试验报告-通过实验ID查询")
     @GetMapping(value = "/queryByExperimentId")
-    public Result<List<ExperimentReport>> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+    public Result<List<ExperimentReport>> queryByExperimentalId(
+            @RequestParam(name = "experimentId", required = true) String experimentalId) {
         LambdaQueryWrapper<ExperimentReport> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ExperimentReport::getExperimentId, experimentalId);
         List<ExperimentReport> experimentReview = experimentReportService.list(queryWrapper);
@@ -197,7 +213,6 @@ public class ExperimentReportController extends JeecgController<ExperimentReport
         return super.importExcel(request, response, ExperimentReport.class);
     }
 
-
     /**
      * 审核
      *

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentTestProcessController.java

@@ -9,6 +9,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
@@ -17,9 +18,7 @@ import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.modules.database.constant.ExperimentStatus;
 import org.jeecg.modules.database.entity.*;
-import org.jeecg.modules.database.service.IExperimentLogService;
+import org.jeecg.modules.database.service.*;
-import org.jeecg.modules.database.service.IExperimentService;
-import org.jeecg.modules.database.service.IExperimentTestProcessService;
 import org.jeecg.modules.system.entity.SysUser;
 import org.jeecg.modules.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -45,8 +44,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
     @Autowired
     private IExperimentLogService experimentLogService;
     @Autowired
-    private ISysUserService userService;
+    private ISysUserService       userService;
-
 
     @Autowired
     private IExperimentService experimentService;
@@ -86,6 +84,9 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
     public Result<String> add(@RequestBody ExperimentTestProcess experimentTestProcess, HttpServletRequest request) {
         experimentTestProcessService.save(experimentTestProcess);
         String experimentId = experimentTestProcess.getExperimentId();
+        if (StringUtils.isBlank(experimentId)) {
+            return Result.error("试验数据不存在！");
+        }
         Experiment experiment = new Experiment();
         experiment.setId(experimentId);
         experiment.setStatus(ExperimentStatus.PROGRESSING);
@@ -178,6 +179,7 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
         }
         return Result.OK(experimentTestProcess);
     }
+
     /**
      * 通过实验id查询
      *
@@ -187,7 +189,8 @@ public class ExperimentTestProcessController extends JeecgController<ExperimentT
     //@AutoLog(value = "试验评定-通过id查询")
     @Operation(summary = "测试过程-通过实验ID查询")
     @GetMapping(value = "/queryByExperimentId")
-    public Result<ExperimentTestProcess> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) {
+    public Result<ExperimentTestProcess> queryByExperimentalId(
+            @RequestParam(name = "experimentId", required = true) String experimentalId) {
         LambdaQueryWrapper<ExperimentTestProcess> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ExperimentTestProcess::getExperimentId, experimentalId);
         ExperimentTestProcess experimentReview = experimentTestProcessService.getOne(queryWrapper);

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentUserController.java

@@ -9,13 +9,16 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.aspect.annotation.AutoLog;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
 import org.jeecg.common.system.util.JwtUtil;
-import org.jeecg.modules.database.entity.*;
+import org.jeecg.modules.database.dto.ExperimentUserDTO;
+import org.jeecg.modules.database.entity.ExperimentLog;
+import org.jeecg.modules.database.entity.ExperimentUser;
 import org.jeecg.modules.database.service.IExperimentLogService;
 import org.jeecg.modules.database.service.IExperimentUserService;
 import org.jeecg.modules.system.entity.SysUser;
@@ -24,7 +27,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.servlet.ModelAndView;
 
-import java.util.Arrays;
+import java.util.*;
 
 /**
  * @Description: 试验人员
@@ -43,7 +46,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
     @Autowired
     private IExperimentLogService experimentLogService;
     @Autowired
-    private ISysUserService userService;
+    private ISysUserService       userService;
 
     /**
      * 分页列表查询
@@ -57,14 +60,28 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
     //@AutoLog(value = "试验人员-分页列表查询")
     @Operation(summary = "试验人员-分页列表查询")
     @GetMapping(value = "/list")
-    public Result<IPage<ExperimentUser>> queryPageList(ExperimentUser experimentUser,
+    public Result<IPage<ExperimentUserDTO>> queryPageList(ExperimentUser experimentUser,
-                                                       @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
+                                                          @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                       @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
+                                                          @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
-                                                       HttpServletRequest req) {
+                                                          HttpServletRequest req) {
         QueryWrapper<ExperimentUser> queryWrapper = QueryGenerator.initQueryWrapper(experimentUser, req.getParameterMap());
-        Page<ExperimentUser> page = new Page<ExperimentUser>(pageNo, pageSize);
+        Page<ExperimentUser> page = new Page<>(pageNo, pageSize);
         IPage<ExperimentUser> pageList = experimentUserService.page(page, queryWrapper);
-        return Result.OK(pageList);
+        List<ExperimentUserDTO> userDTOList = new ArrayList<>();
+        pageList.getRecords().forEach(v -> {
+            ExperimentUserDTO userDTO = ExperimentUserDTO.of(v);
+            SysUser user = userService.getById(v.getUserId());
+            if (Objects.nonNull(user)) {
+                userDTO.setUserName(user.getRealname());
+                userDTOList.add(userDTO);
+            }
+        });
+        Page result = new Page();
+        result.setRecords(userDTOList);
+        result.setCurrent(pageList.getCurrent());
+        result.setTotal(pageList.getTotal());
+        result.setPages(pageList.getPages());
+        return Result.OK(result);
     }
 
     /**
@@ -78,6 +95,10 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
     @RequiresPermissions("database:experiment_user:add")
     @PostMapping(value = "/add")
     public Result<String> add(@RequestBody ExperimentUser experimentUser, HttpServletRequest request) {
+        String experimentId = experimentUser.getExperimentId();
+        if (StringUtils.isBlank(experimentId)) {
+            return Result.error("试验数据不存在！");
+        }
         experimentUserService.save(experimentUser);
         ExperimentLog experimentLog = new ExperimentLog();
         experimentLog.setExperimentId(experimentUser.getExperimentId());
@@ -160,13 +181,19 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
     //@AutoLog(value = "试验人员-通过id查询")
     @Operation(summary = "试验人员-通过id查询")
     @GetMapping(value = "/queryById")
-    public Result<ExperimentUser> queryById(@RequestParam(name = "id", required = true) String id) {
+    public Result<ExperimentUserDTO> queryById(@RequestParam(name = "id", required = true) String id) {
         ExperimentUser experimentUser = experimentUserService.getById(id);
         if (experimentUser == null) {
             return Result.error("未找到对应数据");
         }
-        return Result.OK(experimentUser);
+        ExperimentUserDTO userDTO = ExperimentUserDTO.of(experimentUser);
+        SysUser user = userService.getById(experimentUser.getUserId());
+        if (Objects.nonNull(user)) {
+            userDTO.setUserName(user.getRealname());
+        }
+        return Result.OK(userDTO);
     }
+
     /**
      * 通过实验id查询
      *
@@ -185,6 +212,7 @@ public class ExperimentUserController extends JeecgController<ExperimentUser, IE
         }
         return Result.OK(experimentReview);
     }
+
     /**
      * 导出excel
      *

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentDTO.java

@@ -0,0 +1,144 @@
+/*
+ * Ant Group
+ * Copyright (c) 2004-2024 All Rights Reserved.
+ */
+package org.jeecg.modules.database.dto;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+import org.jeecg.modules.database.entity.Experiment;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author lise
+ * @version ExperimentDTO.java, v 0.1 2024年11月16日 21:13 lise
+ */
+@Getter
+@Setter
+public class ExperimentDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   createTime;
+    /**
+     * 更新人
+     */
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   updateTime;
+    /**
+     * 所属部门
+     */
+    private String sysOrgCode;
+    /**
+     * 试验编号
+     */
+    private String experimentNo;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 试验类型
+     */
+    private String type;
+    /**
+     * 试验日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   startDate;
+    /**
+     * 试验日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   endDate;
+    /**
+     * 辐射源类型
+     */
+    private String radiationSourceType;
+    /**
+     * 委托方名称
+     */
+    private String clientName;
+    /**
+     * 样品型号
+     */
+    private String sampleModel;
+    /**
+     * 试验负责人
+     */
+    private String supervisor;
+    /**
+     * 状态
+     */
+    private String status;
+
+    /**
+     * 样品信息
+     */
+    private String  sampleInfo;
+    /**
+     * 辐照板
+     */
+    private String  irradiationBoard;
+    /**
+     * 偏置条件
+     */
+    private String  deviationCondition;
+    /**
+     * 加偏设备
+     */
+    private String  deviationEquipment;
+    /**
+     * 复制次数
+     */
+    private Integer copyCount;
+
+    /**
+     * 试验负责人
+     */
+    private String supervisorName;
+
+    /**
+     * 试验人员
+     */
+    private List<ExperimentUserDTO> experimentUserList;
+    private String                  experimentUser;
+
+    public static ExperimentDTO of(Experiment experiment) {
+        ExperimentDTO dto = new ExperimentDTO();
+        BeanUtil.copyProperties(experiment, dto);
+        return dto;
+    }
+
+    public static Experiment to(ExperimentDTO experiment) {
+        Experiment dto = new Experiment();
+        BeanUtil.copyProperties(experiment, dto);
+        return dto;
+    }
+
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentRatingDTO.java

@@ -2,15 +2,13 @@
  * Ant Group
  * Copyright (c) 2004-2024 All Rights Reserved.
  */
-package org.jeecg.modules.database;
+package org.jeecg.modules.database.dto;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Getter;
 import lombok.Setter;
-import org.jeecgframework.poi.excel.annotation.Excel;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import java.util.Date;
@@ -24,7 +22,6 @@ import java.util.Date;
 public class ExperimentRatingDTO {
 
     /**主键*/
-    @TableId(type = IdType.ASSIGN_ID)
     private String id;
     /**创建人*/
     private String createBy;

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentUserDTO.java

@@ -0,0 +1,75 @@
+package org.jeecg.modules.database.dto;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+import org.jeecg.modules.database.entity.Experiment;
+import org.jeecg.modules.database.entity.ExperimentUser;
+import org.jeecgframework.poi.excel.annotation.Excel;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @Description: 试验人员
+ * @Author: jeecg-boot
+ * @Date: 2024-08-30
+ * @Version: V1.0
+ */
+@Data
+public class ExperimentUserDTO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键
+     */
+    private String id;
+    /**
+     * 创建人
+     */
+    private String createBy;
+    /**
+     * 创建日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   createTime;
+    /**
+     * 更新人
+     */
+    private String updateBy;
+    /**
+     * 更新日期
+     */
+    @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date   updateTime;
+    /**
+     * 所属部门
+     */
+    private String sysOrgCode;
+    /**
+     * 试验ID
+     */
+    private String experimentId;
+    /**
+     * 人员
+     */
+    private String userId;
+    private String userName;
+    /**
+     * 类型
+     */
+    private String type;
+
+    public static ExperimentUserDTO of(ExperimentUser experiment) {
+        ExperimentUserDTO dto = new ExperimentUserDTO();
+        BeanUtil.copyProperties(experiment, dto);
+        return dto;
+    }
+}

physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java

@@ -105,6 +105,12 @@ public class ExperimentReport implements Serializable {
     @Excel(name = "确认员", width = 15)
     @Schema(description = "确认员")
     private String confirmer;
+    /**
+     * 报告名称
+     */
+    @Excel(name = "报告名称", width = 15)
+    @Schema(description = "报告名称")
+    private String reportName;
     /**
      * 状态
      */