From d87f4435aeae1a2819d6dbe6f60fd2dc5ae77158 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 11 四月 2024 17:36:40 +0800
Subject: [PATCH] 更新
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java | 8 ++++++++
1 files changed, 8 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
index 4507893..ac51b0e 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/IMdcHomeServiceImpl.java
@@ -14,6 +14,7 @@
import org.jeecg.modules.mdc.vo.MdcEquipmentStatusVo;
import org.jeecg.modules.mdc.vo.MdcHomeEfficiencyVo;
import org.jeecg.modules.system.entity.MdcProduction;
+import org.jeecg.modules.system.service.IMdcProductionService;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -37,6 +38,9 @@
@Resource
private MdcHomeMapper mdcHomeMapper;
+
+ @Resource
+ private IMdcProductionService mdcProductionService;
/**
* 璁惧杩愯鐘舵�佺粺璁�
@@ -158,6 +162,7 @@
MdcCommonVo mdcCommonVo = new MdcCommonVo();
mdcCommonVo.setName(mdcProduction.getProductionName());
mdcCommonVo.setProductionCode(mdcProduction.getProductionCode());
+ mdcCommonVo.setProductionId(mdcProduction.getId());
//鑾峰彇姝ゅ眰绾т笅璁惧
List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, mdcProduction.getId());
if (equipmentIdList == null || equipmentIdList.isEmpty()) {
@@ -331,6 +336,9 @@
@Override
public MdcHomeEfficiencyVo getEquipmentEfficiencyStatistics(String userId, String key) {
MdcHomeEfficiencyVo result = new MdcHomeEfficiencyVo();
+ result.setProductionId(key);
+ MdcProduction mdcProduction = mdcProductionService.getById(key);
+ result.setProductionName(mdcProduction.getProductionName());
List<String> equipmentIdList = mdcEquipmentService.getEquipmentIdsProduction(userId, key);
if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
// 鑾峰彇鍒╃敤鐜囨暟鎹�
--
Gitblit v1.9.3