From 2204ca5eca6b4f7046c0192953aa140719ad4c72 Mon Sep 17 00:00:00 2001 From: ls Date: Sat, 16 Nov 2024 21:55:41 +0800 Subject: [PATCH] update --- .../ExperimentAnnealProcessController.java | 5 +- .../controller/ExperimentController.java | 53 +++++-- .../ExperimentRadiationProcessController.java | 17 ++- .../ExperimentRatingController.java | 7 +- .../ExperimentReportController.java | 25 ++- .../ExperimentTestProcessController.java | 15 +- .../controller/ExperimentUserController.java | 50 ++++-- .../modules/database/dto/ExperimentDTO.java | 144 ++++++++++++++++++ .../{ => dto}/ExperimentRatingDTO.java | 5 +- .../database/dto/ExperimentUserDTO.java | 75 +++++++++ .../database/entity/ExperimentReport.java | 6 + 11 files changed, 358 insertions(+), 44 deletions(-) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentDTO.java rename physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/{ => dto}/ExperimentRatingDTO.java (89%) create mode 100644 physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentUserDTO.java diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java index 661624b..f722100 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentAnnealProcessController.java +++ b/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 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); 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 c21086c..e8b40c1 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 @@ -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.Objects; +import java.util.*; /** * @Description: 试验管理 @@ -49,6 +51,8 @@ public class ExperimentController extends JeecgController> queryPageList(Experiment experiment, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + public Result> queryPageList(Experiment experiment, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experiment, req.getParameterMap()); @@ -83,11 +86,25 @@ public class ExperimentController extends JeecgController add(@RequestBody Experiment experiment, HttpServletRequest request) { - experiment.setStatus(ExperimentStatus.PRE_TEST); - experimentService.save(experiment); + public Result add(@RequestBody ExperimentDTO experiment, HttpServletRequest request) { + Experiment experimentDomain = ExperimentDTO.to(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 queryById(@RequestParam(name = "id", required = true) String id) { + public Result 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 userList = experimentUserService.getByExperimentId(dto.getId()); + List 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); } /** diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java index f67ae5b..3bfe616 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRadiationProcessController.java +++ b/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.IExperimentRadiationProcessService; -import org.jeecg.modules.database.service.IExperimentService; +import org.jeecg.modules.database.service.*; 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 queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess, req.getParameterMap()); + QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentRadiationProcess, + req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = experimentRadiationProcessService.page(page, queryWrapper); return Result.OK(pageList); @@ -85,6 +85,9 @@ public class ExperimentRadiationProcessController extends JeecgController 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 queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + public Result queryByExperimentalId( + @RequestParam(name = "experimentId", required = true) String experimentalId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ExperimentRadiationProcess::getExperimentId, experimentalId); ExperimentRadiationProcess experimentReview = experimentRadiationProcessService.getOne(queryWrapper); diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRatingController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRatingController.java index d2a18d5..e1abbd8 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentRatingController.java +++ b/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 add(@RequestBody ExperimentRating experimentRating) { + String experimentId = experimentRating.getExperimentId(); + if (StringUtils.isBlank(experimentId)) { + return Result.error("试验数据不存在！"); + } experimentRatingService.save(experimentRating); return Result.OK("添加成功！"); } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java index 7a60a2c..35fd294 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentReportController.java +++ b/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> queryPageList(ExperimentReport experimentReport, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) { + public Result> queryPageList(ExperimentReport experimentReport, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentReport, req.getParameterMap()); Page page = new Page(pageNo, pageSize); IPage pageList = experimentReportService.page(page, queryWrapper); @@ -79,6 +84,15 @@ public class ExperimentReportController extends JeecgController 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> queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + public Result> queryByExperimentalId( + @RequestParam(name = "experimentId", required = true) String experimentalId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ExperimentReport::getExperimentId, experimentalId); List experimentReview = experimentReportService.list(queryWrapper); @@ -197,7 +213,6 @@ public class ExperimentReportController extends JeecgController 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 queryByExperimentalId(@RequestParam(name = "experimentId", required = true) String experimentalId) { + public Result queryByExperimentalId( + @RequestParam(name = "experimentId", required = true) String experimentalId) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); queryWrapper.eq(ExperimentTestProcess::getExperimentId, experimentalId); ExperimentTestProcess experimentReview = experimentTestProcessService.getOne(queryWrapper); 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 88467c5..34af308 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 @@ -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> queryPageList(ExperimentUser experimentUser, - @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, - HttpServletRequest req) { + public Result> queryPageList(ExperimentUser experimentUser, + @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, + HttpServletRequest req) { QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(experimentUser, req.getParameterMap()); - Page page = new Page(pageNo, pageSize); + Page page = new Page<>(pageNo, pageSize); IPage pageList = experimentUserService.page(page, queryWrapper); - return Result.OK(pageList); + List 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 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 queryById(@RequestParam(name = "id", required = true) String id) { + public Result 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 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; + } + +} \ No newline at end of file diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/ExperimentRatingDTO.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentRatingDTO.java similarity index 89% rename from physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/ExperimentRatingDTO.java rename to physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentRatingDTO.java index f77690b..6fc70f5 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/ExperimentRatingDTO.java +++ b/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; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentUserDTO.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/dto/ExperimentUserDTO.java new file mode 100644 index 0000000..3b1be45 --- /dev/null +++ b/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; + } +} diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java index 9b8199f..7ee40f4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentReport.java +++ b/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; /** * 状态 */