From f6b439c8958e7e0520057404b7226c7507f5d1a1 Mon Sep 17 00:00:00 2001
From: 李林 <z1292839451@163.com>
Date: 星期四, 11 四月 2024 18:01:23 +0800
Subject: [PATCH] 报告生成功能：支持数据填充，发现单元格合并bug，发现模板重复
---
inspect-server/src/main/java/com/yuanchu/mom/dto/SampleOrderDto.java | 22 +++-------------------
1 files changed, 3 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..2960fa8 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
@@ -17,29 +17,13 @@
@Data
public class SampleOrderDto extends InsOrder {
- private Integer sampleId;
-
@ValueTableShow(5)
- @ApiModelProperty("鏍峰搧缂栧彿")
- private String sampleCode;
-
- @ValueTableShow(5)
- @ApiModelProperty("鏍峰搧鍚嶇О")
- private String sample;
-
- @ApiModelProperty("妫�楠岃繘搴�")
- private Integer insProgress;
+ @ApiModelProperty("鏍峰搧绫诲瀷")
+ private String sampleType;
@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