From b364530ee03f8b28b64863f6a633daf05dc94e91 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 十二月 2024 15:55:19 +0800
Subject: [PATCH] 查询站点的检验时长+产量工时bug+检验任务提交撤销+首页待办查最近七天的信息+高低温检验增加检验表字段
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 44 ++++++++++++++++++++++++--------------------
1 files changed, 24 insertions(+), 20 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..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,31 +16,36 @@
@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;
+ private String name;
@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;
+ private String insProgress;
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime sendTime;
-
- public String getInsProgress2() {
- return this.insProgress + "%";
- }
-
- @ApiModelProperty("鎶ュ憡id")
- private String reportId;
+ private List<ReportDto> reportDtos;
}
--
Gitblit v1.9.3