From 2330cdae6bf8a04e34fad5b578deff0091798120 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期三, 14 一月 2026 17:51:06 +0800
Subject: [PATCH] 工时管理:辅助工时编辑后录入人姓名变成编辑人问题修复

---
 inspect-server/src/main/java/com/ruoyi/inspect/mapper/DataAnalysisMapper.java |   17 ++++++++++++++---
 1 files changed, 14 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..123c9fe 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,39 @@
 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);
 
+    List<MaterialPropTableDTO> getMaterialPropTable(@Param("dto") DataAnalysisDto dataAnalysisDto);
+
 
     /**
      * 鏌ヨ妫�娴嬮」闆嗗悎
+     *
      * @param dataAnalysisDto
      * @return
      */
@@ -52,6 +60,7 @@
 
     /**
      * 鏌ヨ鎵�鏈夌殑
+     *
      * @param dataAnalysisDto
      * @return
      */
@@ -62,12 +71,14 @@
 
     /**
      * 鏌ヨ鏈湀涓庝笂鏈堝悎鏍肩巼瀵规瘮
+     *
      * @return
      */
     List<Map<String, Object>> getRawUpMonth();
 
     /**
      * 鏌ヨ妫�楠岄」绫诲瀷楗煎浘
+     *
      * @return
      */
     Map<String, Object> getOrderTypeCookie();

--
Gitblit v1.9.3