From 5ae5596b024929f6ecd857411e7c2d64c1c96aca Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 25 十月 2024 17:23:25 +0800
Subject: [PATCH] 总报告调试
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 47 ++++++++++++++++++++++++++++-------------------
1 files changed, 28 insertions(+), 19 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 945396e..82063bf 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,10 @@
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;
/**
* @author gaoaoy
@@ -17,31 +14,43 @@
@Data
public class SampleOrderDto extends InsOrder {
- private Integer sampleId;
+ @ApiModelProperty("妫�楠屽璞�")
+ private String sampleType;
+
+ @ValueTableShow(3)
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sampleName;
+
+ @ValueTableShow(4)
+ @ApiModelProperty("鏍峰搧鍨嬪彿")
+ private String sampleModel;
+
+ private String assign;
@ValueTableShow(5)
+ @ApiModelProperty("鏍峰搧鏁伴噺")
+ private Integer sampleNum;
+
+ @ValueTableShow(3)
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
- @ValueTableShow(5)
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sample;
-
- @ApiModelProperty("妫�楠岃繘搴�")
- private Integer insProgress;
+ @ValueTableShow(3)
+ @ApiModelProperty("鐢垫満缂栧彿")
+ private String motorNumber;
@ValueTableShow(7)
@ApiModelProperty("妫�楠岃繘搴�%")
- private String insProgress2;
-
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
-
- public String getInsProgress2() {
- return this.insProgress + "%";
- }
+ private String insProgress;
@ApiModelProperty("鎶ュ憡id")
private String reportId;
+ @TableField("`url`")
+ private String url;
+
+ private String urlS;
+
+ private String name;
+
}
--
Gitblit v1.9.3