From ad54d502450e219c38f7d9b878ae07f759ab2a23 Mon Sep 17 00:00:00 2001
From: 朱佳吉 <1527963051@qq.com>
Date: 星期二, 07 五月 2024 17:58:54 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-after
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 34 +++++++++++++---------------------
1 files changed, 13 insertions(+), 21 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..750ee10 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,9 @@
package com.yuanchu.mom.dto;
-import com.fasterxml.jackson.annotation.JsonFormat;
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,29 +13,25 @@
@Data
public class SampleOrderDto extends InsOrder {
- private Integer sampleId;
-
@ValueTableShow(5)
+ @ApiModelProperty("妫�楠屽璞�")
+ private String sampleType;
+
+ @ValueTableShow(6)
+ @ApiModelProperty("鏍峰搧鍚嶇О")
+ private String sampleName;
+
+ @ValueTableShow(6)
+ @ApiModelProperty("鏍峰搧鍨嬪彿")
+ private String sampleModel;
+
+ @ValueTableShow(6)
@ApiModelProperty("鏍峰搧缂栧彿")
private String sampleCode;
- @ValueTableShow(5)
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sample;
-
- @ApiModelProperty("妫�楠岃繘搴�")
- private Integer insProgress;
-
@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;
--
Gitblit v1.9.3