From 23eb9c9a21afc8ed065706f0e6494ee998a217b5 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 04 三月 2026 16:35:27 +0800
Subject: [PATCH] fix:1.班次页面：月度统计时间调整为上月26到本月25；班次支持右键添加批注 2.外购下单：KJNS域订单免检自动更新批次属性；外购下单-全部页新增【更新IFS批次属性】按钮，支持更新已提交订单的批次属性 3.资源要求-设备：设备核查计划：核查负责人回显问题修复；设备使用授权：检验项目导出数据错误问题修复
---
inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java | 23 ++++++++++++++++++++---
1 files changed, 20 insertions(+), 3 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..e108c5d 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,45 @@
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 +66,7 @@
/**
* 鏌ヨ鎵�鏈夌殑
+ *
* @param dataAnalysisDto
* @return
*/
@@ -62,12 +77,14 @@
/**
* 鏌ヨ鏈湀涓庝笂鏈堝悎鏍肩巼瀵规瘮
+ *
* @return
*/
List<Map<String, Object>> getRawUpMonth();
/**
* 鏌ヨ妫�楠岄」绫诲瀷楗煎浘
+ *
* @return
*/
Map<String, Object> getOrderTypeCookie();
--
Gitblit v1.9.3