From 4d93f683c55392439763b2150a82be7c3aaf63e1 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期二, 04 八月 2026 08:34:49 +0800
Subject: [PATCH] 1.不合格处理：修复重新提交OA流程报错问题
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java | 26 ++++++++++++++++++--------
1 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java
index 6cb9f0a..844c5d1 100644
--- a/inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java
+++ b/inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java
@@ -2,6 +2,7 @@
import com.ruoyi.basic.dto.IfsInventoryQuantitySupplierDto;
import com.ruoyi.inspect.dto.DataAnalysisDto;
+import com.ruoyi.inspect.dto.MaterialPropTableDTO;
import com.ruoyi.inspect.vo.RawMaterialSupplierVo;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@@ -19,32 +20,38 @@
public interface DataAnalysisMapper {
/**
- * 鑾峰彇鏈懆鐨勫師鏉愭枡淇℃伅
- * @return
- */
- List<Map<String, Object>> getRawPassRateByBarChartByWeek(@Param("dto") DataAnalysisDto dataAnalysisDto);
-
- /**
- * 鑾峰彇鏈湀鐨勫師鏉愭枡淇℃伅
+ * 鑾峰彇鏈湀鐨勭墿鏂欏睘鎬т俊鎭�
+ *
* @return
*/
List<Map<String, Object>> getRawPassRateByBarChartByDay(@Param("dto") DataAnalysisDto dataAnalysisDto);
/**
- * 鑾峰彇鏈勾鐨勫師鏉愭枡淇℃伅
+ * 鑾峰彇鏈勾鐨勭墿鏂欏睘鎬т俊鎭�
+ *
* @return
*/
List<Map<String, Object>> getRawPassRateByBarChartByYear(@Param("dto") DataAnalysisDto dataAnalysisDtor);
/**
* 鏌ョ湅鍘熸潗鏂欓ゼ鐘跺浘
+ *
* @return
*/
Map<String, Object> getRawPassRateByCake(@Param("dto") DataAnalysisDto dataAnalysisDto);
+ /**
+ * 鏌ョ湅鐗╂枡灞炴�ф槑缁嗚〃鏍�
+ *
+ * @param dataAnalysisDto 鏌ユ壘鍊�
+ * @return 鏄庣粏琛ㄦ牸
+ */
+ List<MaterialPropTableDTO> getMaterialPropTable(@Param("dto") DataAnalysisDto dataAnalysisDto);
+
/**
* 鏌ヨ妫�娴嬮」闆嗗悎
+ *
* @param dataAnalysisDto
* @return
*/
@@ -52,6 +59,7 @@
/**
* 鏌ヨ鎵�鏈夌殑
+ *
* @param dataAnalysisDto
* @return
*/
@@ -62,12 +70,14 @@
/**
* 鏌ヨ鏈湀涓庝笂鏈堝悎鏍肩巼瀵规瘮
+ *
* @return
*/
List<Map<String, Object>> getRawUpMonth();
/**
* 鏌ヨ妫�楠岄」绫诲瀷楗煎浘
+ *
* @return
*/
Map<String, Object> getOrderTypeCookie();
--
Gitblit v1.9.3