From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
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