From 54bae7fcc7a2dca32b7614b698c52399b2920b4f Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期一, 24 三月 2025 13:35:47 +0800
Subject: [PATCH] 近场/远场辐射导入样式修改
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java | 51 ++++++++++++++++++++++++++++++++++++++++++++++++---
1 files changed, 48 insertions(+), 3 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java
index 248dfae..c47335a 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java
@@ -7,6 +7,8 @@
import java.util.Date;
import com.fasterxml.jackson.annotation.JsonFormat;
+import com.yuanchu.mom.annotation.ValueTableShow;
+import com.yuanchu.mom.common.OrderBy;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -16,17 +18,26 @@
*/
@TableName(value ="ins_report")
@Data
-public class InsReport implements Serializable {
+public class InsReport extends OrderBy implements Serializable {
/**
*
*/
@TableId(type = IdType.AUTO)
private Integer id;
+ @ValueTableShow(value = 1, name = "鎶ュ憡缂栧彿")
+ @ApiModelProperty("鎶ュ憡缂栧彿")
+ private String code;
+
/**
* 澶栭敭锛氭楠屽崟id
*/
private Integer insOrderId;
+
+ /**
+ * 澶栭敭锛氭牱鍝乮did
+ */
+ private Integer insSampleId;
/**
* 绯荤粺鐢熸垚鎶ュ憡鍦板潃
@@ -39,14 +50,27 @@
private String urlS;
/**
- * 1锛氭壒鍑� 0锛氭湭鎵瑰噯
+ * 1锛氭壒鍑� 0锛氫笉鎵瑰噯
*/
+ @ValueTableShow(value = 11, name = "鎵瑰噯鐘舵��")
private Integer isRatify;
+ @ValueTableShow(value = 12, name = "鎵瑰噯澶囨敞")
+ private String ratifyTell;
+
/**
- * 1锛氬鏍� 0锛氭湭瀹℃牳
+ * 1锛氬鏍搁�氳繃 0锛氬鏍镐笉閫氳繃
*/
+ @ValueTableShow(value = 7, name = "瀹℃牳鐘舵��")
private Integer isExamine;
+
+ @ValueTableShow(value = 8, name = "瀹℃牳澶囨敞")
+ private String examineTell;
+
+ /**
+ * 澶栭敭锛氱敤鎴穒d锛堟彁浜や汉锛�
+ */
+ private Integer writeUserId;
/**
* 澶栭敭锛氱敤鎴穒d锛堟壒鍑嗕汉锛�
@@ -61,6 +85,7 @@
@TableField(fill = FieldFill.INSERT)
private Integer createUser;
+ @ValueTableShow(value = 2, name = "鍒涘缓鏃堕棿")
@ApiModelProperty("鍒涘缓鏃堕棿")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -73,4 +98,24 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
+
+ /**
+ * 1锛氬凡鎻愪氦 0锛氬緟鎻愪氦
+ */
+ @ValueTableShow(value = 4, name = "鎻愪氦鐘舵��")
+ private Integer state;
+
+ @ValueTableShow(value = 5, name = "鎻愪氦鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime writeTime;
+
+ @ValueTableShow(value = 9, name = "瀹℃牳鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime examineTime;
+
+ @ValueTableShow(value = 13, name = "鎵瑰噯鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime ratifyTime;
+
+
}
\ No newline at end of file
--
Gitblit v1.9.3