From 89601693cac022cd36288f67afc39c079ce70810 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 10 四月 2026 11:11:24 +0800
Subject: [PATCH] feat: 标准成本导入页面接口
---
src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java b/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java
index b036f7e..ab47f1e 100644
--- a/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java
+++ b/src/main/java/com/ruoyi/production/service/impl/ProductionSettlementBatchesServiceImpl.java
@@ -257,8 +257,8 @@
List<Energy> energies = energyService.list();
Map<String, Energy> energyMap = new HashMap<>();
for (Energy energy : energies) {
- if (energy.getEnergyName() != null) {
- energyMap.put(energy.getEnergyName(), energy);
+ if (energy.getEnergyTyep() != null) {
+ energyMap.put(energy.getEnergyTyep(), energy);
}
}
@@ -442,7 +442,7 @@
.flatMap(List::stream)
.collect(Collectors.toList());
- // 鎸� dto 涓殑鍏朵綑鏉′欢鍦ㄥ唴瀛樹腑杩囨护
+ // 鎸� dto 涓殑鍏朵綑鏉′欢杩囨护
if (dto != null) {
if (StringUtils.isNotBlank(dto.getProductType())) {
String targetType = dto.getProductType().trim();
@@ -493,4 +493,12 @@
result.setDiffRate(diffRate);
return result;
}
+
+ @Override
+ public List<ProductionSettlementBatches> importExcelList(String year) {
+ return this.lambdaQuery()
+ .likeRight(ProductionSettlementBatches::getPeriodTime, year)
+ .orderByDesc(ProductionSettlementBatches::getPeriodTime)
+ .list();
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3