update

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

@@ -1,18 +1,18 @@
 package org.jeecg.modules.database.entity;
 
-import java.io.Serializable;
-import java.util.Date;
-
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
-import lombok.Data;
 import com.fasterxml.jackson.annotation.JsonFormat;
-import org.springframework.format.annotation.DateTimeFormat;
-import org.jeecgframework.poi.excel.annotation.Excel;
 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;
+import java.util.Date;
 
 /**
  * @Description: 试验管理
@@ -28,67 +28,128 @@ import lombok.experimental.Accessors;
 public class Experiment implements Serializable {
     private static final long serialVersionUID = 1L;
 
-	/**主键*/
+    /**
+     * 主键
+     */
     @TableId(type = IdType.ASSIGN_ID)
     @Schema(description = "主键")
     private String id;
-	/**创建人*/
+    /**
+     * 创建人
+     */
     @Schema(description = "创建人")
     private String createBy;
-	/**创建日期*/
+    /**
+     * 创建日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "创建日期")
     private Date createTime;
-	/**更新人*/
+    /**
+     * 更新人
+     */
     @Schema(description = "更新人")
     private String updateBy;
-	/**更新日期*/
+    /**
+     * 更新日期
+     */
     @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     @Schema(description = "更新日期")
     private Date updateTime;
-	/**所属部门*/
+    /**
+     * 所属部门
+     */
     @Schema(description = "所属部门")
     private String sysOrgCode;
-	/**试验编号*/
+    /**
+     * 试验编号
+     */
     @Excel(name = "试验编号", width = 15)
     @Schema(description = "试验编号")
     private String experimentNo;
-	/**名称*/
+    /**
+     * 名称
+     */
     @Excel(name = "名称", width = 15)
     @Schema(description = "名称")
     private String name;
-	/**试验类型*/
+    /**
+     * 试验类型
+     */
     @Excel(name = "试验类型", width = 15)
     @Schema(description = "试验类型")
     private String type;
-	/**试验日期*/
+    /**
-	@Excel(name = "试验开始日期", width = 15)
+     * 试验日期
+     */
+    @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 startDate;
-    /**试验日期*/
+    /**
-    @Excel(name = "试验结束日期", width = 15)
+     * 试验日期
+     */
+    @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 endDate;
-	/**辐射源类型*/
+    /**
+     * 辐射源类型
+     */
     @Excel(name = "辐射源类型", width = 15)
     @Schema(description = "辐射源类型")
     private String radiationSourceType;
-	/**委托方名称*/
+    /**
+     * 委托方名称
+     */
     @Excel(name = "委托方名称", width = 15)
     @Schema(description = "委托方名称")
     private String clientName;
-	/**样品型号*/
+    /**
+     * 样品型号
+     */
     @Excel(name = "样品型号", width = 15)
     @Schema(description = "样品型号")
     private String sampleModel;
-	/**试验负责人*/
+    /**
+     * 试验负责人
+     */
     @Excel(name = "试验负责人", width = 15)
     @Schema(description = "试验负责人")
     private String supervisor;
-	/**状态*/
+    /**
+     * 状态
+     */
     @Excel(name = "状态", width = 15)
     @Schema(description = "状态")
     private String status;
+
+    /**
+     * 样品信息
+     */
+    @Excel(name = "样品信息", width = 15)
+    @Schema(description = "样品信息")
+    private String sampleInfo;
+    /**
+     * 辐照板
+     */
+    @Excel(name = "辐照板", width = 15)
+    @Schema(description = "辐照板")
+    private String irradiationBoard;
+    /**
+     * 偏置条件
+     */
+    @Excel(name = "偏置条件", width = 15)
+    @Schema(description = "偏置条件")
+    private String deviationCondition;
+    /**
+     * 加偏设备
+     */
+    @Excel(name = "加偏设备", width = 15)
+    @Schema(description = "加偏设备")
+    private String deviationEquipment;
 }