diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java index 7f8f374..d8ba537 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentAnnealProcess.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 退火过程 * @Author: jeecg-boot - * @Date: 2024-10-21 + * @Date: 2024-10-23 * @Version: V1.0 */ @Data @@ -86,4 +86,24 @@ public class ExperimentAnnealProcess implements Serializable { @Excel(name = "试验ID", width = 15) @Schema(description = "试验ID") private String experimentId; + /**退火开始时间*/ + @Excel(name = "退火开始时间", width = 20, format = "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 Date annealStartTime; + /**退火结束时间*/ + @Excel(name = "退火结束时间", width = 20, format = "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 Date annealEndTime; + /**偏置条件*/ + @Excel(name = "偏置条件", width = 15) + @Schema(description = "偏置条件(json 大字段)") + private String biasCondition; + /**加偏设备*/ + @Excel(name = "加偏设备", width = 15) + @Schema(description = "加偏设备(json 大字段)") + private String biasEquipment; } diff --git a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java index 9c9afa3..8cb44d4 100644 --- a/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java +++ b/physical-module-system/physical-system-biz/src/main/java/org/jeecg/modules/database/entity/ExperimentTestProcess.java @@ -103,11 +103,11 @@ public class ExperimentTestProcess implements Serializable { @Schema(description = "环境湿度") private String environmentalHumidity; /**测试参数(json 大字段)*/ - @Excel(name = "测试参数(json 大字段)", width = 15) + @Excel(name = "测试参数", width = 15) @Schema(description = "测试参数(json 大字段)") private String testParameters; /**测试设备(json 大字段)*/ - @Excel(name = "测试设备(json 大字段)", width = 15) + @Excel(name = "测试设备", width = 15) @Schema(description = "测试设备(json 大字段)") private String testEquipment; /**测试计量点*/ @@ -123,7 +123,7 @@ public class ExperimentTestProcess implements Serializable { @Schema(description = "退火时长") private String annealingDuration; /**测试数据(json 大字段)*/ - @Excel(name = "测试数据(json 大字段)", width = 15) + @Excel(name = "测试数据", width = 15) @Schema(description = "测试数据(json 大字段)") private String testData; /**测试结果*/