From 4c33acfe648e9b008f91c5e2cf446550e6b0174d Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期二, 22 七月 2025 17:35:57 +0800
Subject: [PATCH] 1.正式库导出优化 2.销售导出 3.设备使用状态优化 4.定时任务优化
---
main-business/src/main/java/com/ruoyi/business/service/OfficialInventoryService.java | 11 ++++++++++-
1 files changed, 10 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..eb67537 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
@@ -6,8 +6,11 @@
import com.ruoyi.business.entity.OfficialInventory;
import com.baomidou.mybatisplus.extension.service.IService;
import com.ruoyi.business.vo.OfficialInventoryVo;
+import jakarta.servlet.http.HttpServletResponse;
+import java.math.BigDecimal;
import java.util.List;
+import java.util.Map;
/**
* <p>
@@ -19,7 +22,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 +31,10 @@
List<OfficialInventoryVo> selectOfficialList(OfficialInventoryVo officialInventoryVo);
List<OfficialInventory> selectOfficialAll();
+
+ Map<String, BigDecimal> selectOfficialAllInfo();
+
+ List<OfficialInventoryDto> coalBlendingList();
+
+ void officialInventoryExport(HttpServletResponse response, OfficialInventoryDto officialInventoryDto);
}
--
Gitblit v1.9.3