From 544afa4dabaccb0248bf0b6fcfdc7b9b6c2ea9f2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 13 一月 2026 17:56:38 +0800
Subject: [PATCH] 合格率统计重构：根据物料属性分类返回对应的合格/不合格数据量
---
inspect-server/src/main/java/com/ruoyi/inspect/controller/DataAnalysisController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/controller/DataAnalysisController.java b/inspect-server/src/main/java/com/ruoyi/inspect/controller/DataAnalysisController.java
index 130e075..933df44 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/controller/DataAnalysisController.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/controller/DataAnalysisController.java
@@ -25,30 +25,44 @@
private DataAnalysisService dataAnalysisService;
/**
- * 鏌ヨ鍘熸潗鏂欐煴鐘剁粺璁�
+ * 鏌ヨ鐗╂枡灞炴�ф煴鐘剁粺璁�
+ *
* @param dataAnalysisDto
* @return
*/
- @ApiOperation(value = "鏌ヨ鍘熸潗鏂欐煴鐘剁粺璁�")
+ @ApiOperation(value = "鏌ヨ鐗╂枡灞炴�ф煴鐘剁粺璁�")
@GetMapping("/getRawPassRateByBarChart")
public Result getRawPassRateByBarChart(DataAnalysisDto dataAnalysisDto) {
return Result.success(dataAnalysisService.getRawPassRateByBarChart(dataAnalysisDto));
}
/**
- * 鏌ヨ鍘熸潗鏂欐煴鐘剁粺璁�
+ * 鏌ヨ鐗╂枡灞炴�ф煴鐘剁粺璁�
+ *
* @param dataAnalysisDto
* @return
*/
- @ApiOperation(value = "鏌ヨ鍘熸潗鏂欏悎鏍肩巼楗肩姸鎬�")
+ @ApiOperation(value = "鏌ヨ鐗╂枡灞炴�у悎鏍肩巼楗肩姸鍥�")
@GetMapping("/getRawPassRateByCake")
public Result getRawPassRateByCake(DataAnalysisDto dataAnalysisDto) {
return Result.success(dataAnalysisService.getRawPassRateByCake(dataAnalysisDto));
}
+ /**
+ * 鏌ヨ鐗╂枡灞炴�у悎鏍肩巼琛ㄦ牸
+ *
+ * @param dataAnalysisDto
+ * @return
+ */
+ @ApiOperation(value = "鏌ヨ鐗╂枡灞炴�у悎鏍肩巼琛ㄦ牸")
+ @GetMapping("/getMaterialPropTable")
+ public Result getMaterialPropTable(DataAnalysisDto dataAnalysisDto) {
+ return Result.success(dataAnalysisService.getMaterialPropTable(dataAnalysisDto));
+ }
/**
* 鏌ヨ鍘熸潗鏂欓」
+ *
* @param dataAnalysisDto
* @return
*/
@@ -60,6 +74,7 @@
/**
* 鏌ヨ鍘熸潗鏂欓」妫�鍒嗘瀽
+ *
* @param dataAnalysisDto
* @return
*/
@@ -71,6 +86,7 @@
/**
* 鏌ヨ鍘熸潗鏂欓」妫�鍒嗘瀽鍒楄〃
+ *
* @param dataAnalysisDto
* @return
*/
@@ -82,6 +98,7 @@
/**
* 鏌ヨ鍘熸潗鏂欓」妫�鍒嗘瀽鍒楄〃
+ *
* @param dataAnalysisDto
* @return
*/
@@ -93,6 +110,7 @@
/**
* 鏌ヨ鍘熸潗鏂欓」妫�鍜屽巶瀹舵暟鎹姣�
+ *
* @param dataAnalysisDto
* @return
*/
@@ -104,6 +122,7 @@
/**
* 鏌ヨ鏈湀涓庝笂涓湀鍚堟牸鐜囧姣�
+ *
* @param dataAnalysisDto
* @return
*/
@@ -115,6 +134,7 @@
/**
* 鏌ヨ妫�楠岄」绫诲瀷楗煎浘
+ *
* @param dataAnalysisDto
* @return
*/
--
Gitblit v1.9.3