From 901bab9b8b1c3773a644bdc74f5eafd666591aeb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期四, 17 九月 2026 13:37:24 +0800
Subject: [PATCH] feat: 1委托单 2下单详情 3检验任务 4检验任务复核 5检验任务详情 6标准维护 7检验单详情 8报告编制
---
inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java | 30 ++++++++++++++++++++++++++++--
1 files changed, 28 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
index 629ed12..7a8f596 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/pojo/InsOrder.java
@@ -6,6 +6,7 @@
import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
import java.time.LocalDate;
@@ -85,7 +86,8 @@
@ApiModelProperty("涓嬪崟鏃堕棿")
@TableField(fill = FieldFill.INSERT)
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
@ApiModelProperty("涓嬪彂鏃堕棿")
@@ -176,7 +178,7 @@
private Integer typeSource;
@ApiModelProperty("鍘熸潗鏂檌d")
- private Integer ifsInventoryId;
+ private Long ifsInventoryId;
@ApiModelProperty("鎶芥煡鏁伴噺")
private String testQuantity;
@@ -193,8 +195,25 @@
@ApiModelProperty("婀垮害")
private String humidity;
+ @TableField(exist = false)
+ @ApiModelProperty("褰撳墠濉啓鐜鏉′欢鐨勬ā鏉縄D")
+ private Integer templateId;
+
@ApiModelProperty("鏍峰搧鐘舵��")
private String sampleStatus;
+
+ @ApiModelProperty("閫佹牱鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate sampleDate;
+
+ @ApiModelProperty("鐢熶骇鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ private LocalDate productionDate;
+
+ @ApiModelProperty("鐢熶骇鎵瑰彿")
+ private String productionBatch;
@ApiModelProperty("瀛ｅ害鎶芥牱椤圭洰id")
private Integer quarterItemId;
@@ -211,4 +230,11 @@
@ApiModelProperty("绗竴娆℃彁浜ゆ椂闂�")
private LocalDateTime firstSubmitDate;
+ @ApiModelProperty("棣栨淇濆瓨妫�楠屾ā鏉垮�兼椂闂�")
+ private LocalDateTime firstInspectDate;
+
+ @ApiModelProperty("鏍锋満鍛�(闄や簡鍏朵粬鎴愬搧澶栬繖涓瓧娈靛繀閫�,鐢ㄤ簬浼佷笟寰俊鎺ㄩ��)")
+ @TableField(exist = false)
+ private Integer issueUser;
+
}
--
Gitblit v1.9.3