From 4497f5b1e322eba5ec519ebc1955317ed656aa8e Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期四, 26 十二月 2024 14:31:15 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/pojo/InsReport.java | 44 +++++++++++++++++++++++++++++++++++++-------
1 files changed, 37 insertions(+), 7 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 78fe548..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
@@ -35,6 +35,11 @@
private Integer insOrderId;
/**
+ * 澶栭敭锛氭牱鍝乮did
+ */
+ private Integer insSampleId;
+
+ /**
* 绯荤粺鐢熸垚鎶ュ憡鍦板潃
*/
private String url;
@@ -45,22 +50,27 @@
private String urlS;
/**
- * 1锛氭壒鍑� 0锛氭湭鎵瑰噯
+ * 1锛氭壒鍑� 0锛氫笉鎵瑰噯
*/
- @ValueTableShow(value = 9, name = "鎵瑰噯鐘舵��")
+ @ValueTableShow(value = 11, name = "鎵瑰噯鐘舵��")
private Integer isRatify;
- @ValueTableShow(value = 10, name = "鎵瑰噯澶囨敞")
+ @ValueTableShow(value = 12, name = "鎵瑰噯澶囨敞")
private String ratifyTell;
/**
- * 1锛氬鏍� 0锛氭湭瀹℃牳
+ * 1锛氬鏍搁�氳繃 0锛氬鏍镐笉閫氳繃
*/
- @ValueTableShow(value = 6, name = "瀹℃牳鐘舵��")
+ @ValueTableShow(value = 7, name = "瀹℃牳鐘舵��")
private Integer isExamine;
- @ValueTableShow(value = 7, name = "瀹℃牳澶囨敞")
+ @ValueTableShow(value = 8, name = "瀹℃牳澶囨敞")
private String examineTell;
+
+ /**
+ * 澶栭敭锛氱敤鎴穒d锛堟彁浜や汉锛�
+ */
+ private Integer writeUserId;
/**
* 澶栭敭锛氱敤鎴穒d锛堟壒鍑嗕汉锛�
@@ -75,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")
@@ -83,9 +94,28 @@
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(value = 4, name = "缂栧埗鏃堕棿")
@ApiModelProperty("淇敼鏃堕棿")
@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