From e59b660b580fd96447b213679d55202529370028 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 23 十二月 2024 14:20:00 +0800
Subject: [PATCH] 报告调整
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 34 +++++++++++++++++++++++++++-------
1 files changed, 27 insertions(+), 7 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 2960fa8..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
@@ -1,13 +1,12 @@
package com.yuanchu.mom.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
+import com.baomidou.mybatisplus.annotation.TableField;
import com.yuanchu.mom.annotation.ValueTableShow;
import com.yuanchu.mom.pojo.InsOrder;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import java.time.LocalDate;
-import java.time.LocalDateTime;
+import java.util.List;
/**
* @author gaoaoy
@@ -17,15 +16,36 @@
@Data
public class SampleOrderDto extends InsOrder {
- @ValueTableShow(5)
- @ApiModelProperty("鏍峰搧绫诲瀷")
+ @ApiModelProperty("妫�楠屽璞�")
private String sampleType;
+
+ @ValueTableShow(3)
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sampleName;
+
+ @ValueTableShow(4)
+ @ApiModelProperty("鏍峰搧鍨嬪彿")
+ private String sampleModel;
+
+ 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;
+ private List<ReportDto> reportDtos;
}
--
Gitblit v1.9.3