From fbd4ecb70baf2e671876ca809a81f6e6fe7342ee Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期日, 20 九月 2026 19:52:50 +0800
Subject: [PATCH] feat(inspect): 新增检测标准方法报告文本功能并优化报告生成 - 委托编号生成逻辑调整为下单时生成并校验唯一性，避免审核时重复 - 新增标准模板价格字段及对应的数据模型和数据库映射 - 订单费用详情查询逻辑重构为基于模板价格计算方式 - 新增标准模板与设备绑定关系的数据结构和管理功能 - 委托编号唯一性校验逻辑增强
---
inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java
index c48c862..1fc6312 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/dto/CostStatisticsDto.java
@@ -13,37 +13,37 @@
public class CostStatisticsDto{
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","ZTT/QR-30-01-01","鏃ユ湡"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鏃ユ湡"})
private LocalDateTime createTime;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","ZTT/QR-30-01-01","妫�楠岀紪鍙�"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","妫�楠岀紪鍙�"})
private String entrustCode;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鏍峰搧鍚嶇О"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鏍峰搧鍚嶇О"})
private String sample;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","瑙勬牸鍨嬪彿"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","瑙勬牸鍨嬪彿"})
private String model;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鏍峰搧鏁伴噺"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鏍峰搧鏁伴噺"})
private Integer num;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鎬讳环"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鎬讳环"})
private BigDecimal price;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","璇曢獙椤圭洰"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","璇曢獙椤圭洰"})
private String inspectionItem;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","濮旀墭鍗曚綅"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","濮旀墭鍗曚綅"})
private String company;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","濮旀墭浜�"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","濮旀墭浜�"})
private String name;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","鐢熶骇鍗曚綅"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","鐢熶骇鍗曚綅"})
private String production;
- @ExcelProperty(value ={"涓ぉ绉戞妧妫�娴嬩腑蹇冩牱鍝佺櫥璁拌〃","宸ョ▼鍚嶇О"})
+ @ExcelProperty(value ={"鏍峰搧鐧昏琛�","宸ョ▼鍚嶇О"})
private String engineering;
@ExcelIgnore
--
Gitblit v1.9.3