diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentFileType.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentFileType.java index 6e8c8ff..d08fd53 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentFileType.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/constant/ExperimentFileType.java @@ -23,15 +23,16 @@ public enum ExperimentFileType { // 辐照试验更改申请表 // 满意度调查表 // 其他文件 - FZSYWTS("辐照试验委托书"), - SYDG("试验大纲"), - GTJLB("沟通记录表"), - HTPSB("合同/委托书评审表"), - SYDGPSB("试验大纲评审表"), - SYLCJCD("试验流程检查单"), - FZSYGGSQB("辐照试验更改申请表"), - MYDDCB("满意度调查表"), - QTWJ("其他文件"), + + fzsywts("辐照试验委托书"), + sydg("试验大纲"), + gtjlb("沟通记录表"), + htwtspsb("合同/委托书评审表"), + sydgpsb("试验大纲评审表"), + sylcjyd("试验流程检验单"), + fzsyggsqb("辐照试验更改申请表"), + mydcb("满意度调查表"), + qtwj("其它文件"), ; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java index c22ff3b..87e59cc 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/controller/ExperimentFileController.java @@ -205,7 +205,7 @@ public class ExperimentFileController extends JeecgController result = new Result<>(); if (StringUtils.isBlank(fileType)) { - fileType = ExperimentFileType.QTWJ.getType(); + fileType = ExperimentFileType.qtwj.getType(); } MultipartHttpServletRequest multipartRequest = (MultipartHttpServletRequest) request; diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.java index a3912a2..e829dfd 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentDeviationCondition.java @@ -1,85 +1,100 @@ package org.jeecg.modules.database.entity; -import java.io.Serializable; -import java.io.UnsupportedEncodingException; -import java.util.Date; -import java.math.BigDecimal; -import com.baomidou.mybatisplus.annotation.IdType; -import com.baomidou.mybatisplus.annotation.TableId; -import com.baomidou.mybatisplus.annotation.TableName; -import com.baomidou.mybatisplus.annotation.TableLogic; -import lombok.Data; +import com.baomidou.mybatisplus.annotation.*; import com.fasterxml.jackson.annotation.JsonFormat; -import org.springframework.format.annotation.DateTimeFormat; -import org.jeecgframework.poi.excel.annotation.Excel; -import org.jeecg.common.aspect.annotation.Dict; import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; import lombok.EqualsAndHashCode; import lombok.experimental.Accessors; +import org.jeecgframework.poi.excel.annotation.Excel; +import org.springframework.format.annotation.DateTimeFormat; + +import java.io.Serializable; /** * @Description: 试验偏置条件信息 * @Author: jeecg-boot - * @Date: 2024-12-05 + * @Date: 2024-12-05 * @Version: V1.0 */ @Data @TableName("experiment_deviation_condition") @Accessors(chain = true) @EqualsAndHashCode(callSuper = false) -@Schema(description="试验偏置条件信息") +@Schema(description = "试验偏置条件信息") public class ExperimentDeviationCondition implements Serializable { private static final long serialVersionUID = 1L; - /**主键*/ - @TableId(type = IdType.ASSIGN_ID) + /** + * 主键 + */ + @TableId(type = IdType.ASSIGN_ID) @Schema(description = "主键") private java.lang.String id; - /**创建人*/ + /** + * 创建人 + */ @Schema(description = "创建人") private java.lang.String createBy; - /**创建日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 创建日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "创建日期") - private java.util.Date createTime; - /**更新人*/ + private java.util.Date createTime; + /** + * 更新人 + */ @Schema(description = "更新人") private java.lang.String updateBy; - /**更新日期*/ - @JsonFormat(timezone = "GMT+8",pattern = "yyyy-MM-dd HH:mm:ss") - @DateTimeFormat(pattern="yyyy-MM-dd HH:mm:ss") + /** + * 更新日期 + */ + @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss") + @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss") @Schema(description = "更新日期") - private java.util.Date updateTime; - /**所属部门*/ + private java.util.Date updateTime; + /** + * 所属部门 + */ @Schema(description = "所属部门") private java.lang.String sysOrgCode; - /**试验ID*/ - @Excel(name = "试验ID", width = 15) + /** + * 试验ID + */ + @Excel(name = "试验ID", width = 15) @Schema(description = "试验ID") private java.lang.String experimentId; - /**样品类型*/ - @Excel(name = "样品类型", width = 15) + /** + * 样品类型 + */ + @Excel(name = "样品类型", width = 15) @Schema(description = "样品类型") private java.lang.String sampleType; - /**样品型号*/ - @Excel(name = "样品型号", width = 15) + /** + * 样品型号 + */ + @Excel(name = "样品型号", width = 15) @Schema(description = "样品型号") private java.lang.String sampleModel; - /**样品编号*/ - @Excel(name = "样品编号", width = 15) + /** + * 样品编号 + */ + @Excel(name = "样品编号", width = 15) @Schema(description = "样品编号") private java.lang.String sampleNumber; - /**偏执条件*/ - @Excel(name = "偏执条件", width = 15) - @Schema(description = "偏执条件") + /** + * 偏置条件 + */ + @Excel(name = "偏置条件", width = 15) + @Schema(description = "偏置条件") private java.lang.String offsetCondition; - /**负载*/ - @Excel(name = "负载", width = 15) - @Schema(description = "负载") - private java.lang.String loadCapacity; - /**图片*/ - @Excel(name = "图片", width = 15) - @Schema(description = "图片") - private java.lang.String sampleImage; + /** + * 偏置条件 + */ + @Excel(name = "偏置条件", width = 15) + @Schema(description = "偏置值") + private java.lang.String offsetValue; + } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java index e9fa348..6ba3de9 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/service/impl/ExperimentServiceImpl.java @@ -138,8 +138,6 @@ public class ExperimentServiceImpl extends ServiceImpl