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/CostStatisticsDto.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java b/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
index 5abd147..5c9291d 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/dto/CostStatisticsDto.java
@@ -7,6 +7,7 @@
import java.math.BigDecimal;
import java.time.LocalDateTime;
+import java.util.List;
@Data
public class CostStatisticsDto extends OrderBy {
@@ -25,13 +26,13 @@
private String model;
@ValueTableShow(value = 5, name = "鏍峰搧鏁伴噺")
- private Integer num = 1;
+ private Integer num;
@ValueTableShow(value = 6, name = "鎬讳环")
private BigDecimal price;
@ValueTableShow(value = 7, name = "璇曢獙椤圭洰")
- private String product;
+ private String inspectionItem;
@ValueTableShow(value = 8, name = "濮旀墭鍗曚綅")
private String company;
@@ -41,4 +42,9 @@
private Integer createUser;
+ private Integer insSampleId;
+
+ public Integer getNum() {
+ return num = 1;
+ }
}
--
Gitblit v1.9.3