From 6733a32d4bcd7ad3ec3f109da0f3d2524766f7bb Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 15 七月 2025 15:54:33 +0800
Subject: [PATCH] 1.数据优化 2.配煤计算器入库优化

---
 main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java b/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java
index 392ef27..67b885b 100644
--- a/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java
+++ b/main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java
@@ -7,7 +7,9 @@
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.ruoyi.business.vo.OfficialInventoryVo;
 
+import java.math.BigDecimal;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -19,7 +21,7 @@
  */
 public interface OfficialInventoryService extends IService<OfficialInventory> {
 
-    IPage<OfficialInventoryDto> selectOfficialInventoryList(Page page, OfficialInventoryDto officialInventoryDto);
+    IPage<OfficialInventoryDto> selectOfficialInventoryList(Page<OfficialInventory> page, OfficialInventoryDto officialInventoryDto);
 
     int mergeAll(OfficialInventoryDto officialInventoryDto);
 
@@ -28,4 +30,8 @@
     List<OfficialInventoryVo> selectOfficialList(OfficialInventoryVo officialInventoryVo);
 
     List<OfficialInventory> selectOfficialAll();
+
+    Map<String, BigDecimal> selectOfficialAllInfo();
+
+    List<OfficialInventoryDto> coalBlendingList();
 }

--
Gitblit v1.9.3