From df13f27e9cae2d7b112ef0dda85cba456ecef32b Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 26 二月 2025 16:45:09 +0800
Subject: [PATCH] 远场和近场的数据解析的单位和指标需要重新对应+报告生成放在复核结束里面
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 28 +++++++++++++++++-----------
1 files changed, 17 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
index b9e8424..909b73d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java
@@ -6,6 +6,8 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.util.List;
+
/**
* @author gaoaoy
* @version 1.0.0
@@ -14,32 +16,36 @@
@Data
public class SampleOrderDto extends InsOrder {
- @ValueTableShow(5)
@ApiModelProperty("妫�楠屽璞�")
private String sampleType;
- @ValueTableShow(6)
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧鍚嶇О")
private String sampleName;
- @ValueTableShow(6)
+ @ValueTableShow(4)
@ApiModelProperty("鏍峰搧鍨嬪彿")
private String sampleModel;
- @ValueTableShow(6)
+ private String assign;
+ private String name;
+
+ @ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Integer sampleNum;
+
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
+
+ @ValueTableShow(3)
+ @ApiModelProperty("鐢垫満缂栧彿")
+ private String motorNumber;
@ValueTableShow(7)
@ApiModelProperty("妫�楠岃繘搴�%")
private String insProgress;
- @ApiModelProperty("鎶ュ憡id")
- private String reportId;
-
- @TableField("`url`")
- private String url;
-
- private String urlS;
+ private List<ReportDto> reportDtos;
}
--
Gitblit v1.9.3