From 7a681887e5a8e1aab49acc886974d354c69a280e Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 17 九月 2026 13:10:38 +0800
Subject: [PATCH] feat(mes): 新增质检指标分组树和平行测量功能
---
yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/vo/MesQcIndicatorResultRespVO.java | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 50 insertions(+), 4 deletions(-)
diff --git a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/vo/MesQcIndicatorResultRespVO.java b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/vo/MesQcIndicatorResultRespVO.java
index 7d81a2b..58dcbe4 100644
--- a/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/vo/MesQcIndicatorResultRespVO.java
+++ b/yudao-module-mes/src/main/java/cn/iocoder/yudao/module/mes/controller/admin/qc/indicatorresult/vo/MesQcIndicatorResultRespVO.java
@@ -39,11 +39,11 @@
@Schema(description = "妫�楠岀粨鏋滄槑缁嗗垪琛�")
private List<Item> items;
- @Schema(description = "妫�楠岀粨鏋滄槑缁嗛」")
+ @Schema(description = "妫�楠岀粨鏋滄槑缁嗛」锛堟爲褰細鍒嗙粍椤逛笅鎸傚瓙椤癸紱骞宠娴嬮噺鏀惧叆 measures锛�")
@Data
public static class Item {
- @Schema(description = "缂栧彿", example = "1024")
+ @Schema(description = "缂栧彿锛堢涓�鎵规槑缁嗙殑 ID锛屽吋瀹规棫瀛楁锛�", example = "1024")
private Long id;
@Schema(description = "鍏宠仈妫�楠岀粨鏋淚D", example = "1")
@@ -52,10 +52,10 @@
@Schema(description = "妫�娴嬫寚鏍嘔D", example = "1")
private Long indicatorId;
- @Schema(description = "妫�娴嬪�硷紙缁熶竴瀛樹负瀛楃涓诧級", example = "3.14")
+ @Schema(description = "妫�娴嬪�硷紙绗竴鎵规祴閲忓�硷紝鍏煎鏃у瓧娈碉級", example = "3.14")
private String value;
- @Schema(description = "澶囨敞", example = "鏃�")
+ @Schema(description = "澶囨敞锛堢涓�鎵规槑缁嗙殑澶囨敞锛屽吋瀹规棫瀛楁锛�", example = "鏃�")
private String remark;
// ========== 鍏宠仈鏌ヨ瀛楁锛堟潵鑷� indicator锛� ==========
@@ -69,6 +69,52 @@
@Schema(description = "鍊煎睘鎬�", example = "IMG")
private String valueSpecification;
+ @Schema(description = "鐖舵寚鏍囩紪鍙凤紙0=椤剁骇锛�", example = "0")
+ private Long parentId;
+
+ @Schema(description = "鏉＄洰绫诲瀷锛�1=褰曞叆椤癸紝2=鍒嗙粍椤�", example = "1")
+ private Integer itemType;
+
+ @Schema(description = "鍏紡灞曠ず鏂囨湰锛堟墦鍗版姤鍛婄敤锛�", example = "w3=c1v1*0.06005/pv*100%")
+ private String formulaText;
+
+ @Schema(description = "鍗曚綅鏂囨湰锛堟墦鍗板睍绀虹敤锛�", example = "kg/m鲁")
+ private String unitText;
+
+ @Schema(description = "鍚岀骇鎺掑簭鍙�", example = "10")
+ private Integer sortOrder;
+
+ // ========== 骞宠娴嬮噺 ==========
+
+ @Schema(description = "娴嬮噺鎵规鏄庣粏鍒楄〃锛堟寜 measureNo 鍗囧簭锛�")
+ private List<Measure> measures;
+
+ // ========== 鏍戝舰缁撴瀯 ==========
+
+ @Schema(description = "瀛愰」鍒楄〃锛堝垎缁勯」涓嬫寕锛�")
+ private List<Item> children;
+
+ }
+
+ @Schema(description = "妫�楠岀粨鏋滄祴閲忔壒娆℃槑缁嗭紙鍚屼竴鎸囨爣鐨勪竴娆″钩琛屾祴閲忥級")
+ @Data
+ public static class Measure {
+
+ @Schema(description = "鏄庣粏缂栧彿", example = "1024")
+ private Long detailId;
+
+ @Schema(description = "鍏宠仈妫�楠岀粨鏋淚D", example = "1")
+ private Long resultId;
+
+ @Schema(description = "娴嬮噺鎵规鍙�", example = "1")
+ private Integer measureNo;
+
+ @Schema(description = "妫�娴嬪��", example = "3.14")
+ private String value;
+
+ @Schema(description = "澶囨敞", example = "鏃�")
+ private String remark;
+
}
}
--
Gitblit v1.9.3