From d10ee39ef95eb2442902e36dd36b1683cbd10af6 Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期四, 06 三月 2025 15:10:03 +0800
Subject: [PATCH] art: 项目性维修-详情页面-附件，设备状态，技术状态不展示问题修改, 设备选择过滤，只能选择用户范围内的设备信息
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 22 ++++++++++++++++++++++
1 files changed, 22 insertions(+), 0 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
index f6a2e6d..6575ebd 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java
@@ -15,6 +15,7 @@
import org.jeecg.modules.system.entity.SysDepart;
import org.jeecg.modules.system.service.IMdcProductionService;
import org.jeecg.modules.system.service.ISysDepartService;
+import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
@@ -1599,6 +1600,17 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
result.setMdcEfficiencyList(listDtos);
} else {
+
+ MdcEfficiencyReportQueryVo vo1 = new MdcEfficiencyReportQueryVo();
+ BeanUtils.copyProperties(vo, vo1);
+ List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo1);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ vo.setEquipmentIdList(equipmentIdList);
+ } else {
+ result.setMdcEfficiencyList(listDtos);
+ return result;
+ }
+
// 鍒╃敤鐜囩瓑绾�
List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
@@ -1691,6 +1703,16 @@
if (vo.getEquipmentIdList() == null || vo.getEquipmentIdList().isEmpty()) {
result.setMdcEfficiencyList(listDtos);
} else {
+ MdcEfficiencyReportQueryVo vo1 = new MdcEfficiencyReportQueryVo();
+ BeanUtils.copyProperties(vo, vo1);
+ List<String> equipmentIdList = mdcEquipmentService.listEquipmentId(vo1);
+ if (equipmentIdList != null && !equipmentIdList.isEmpty()) {
+ vo.setEquipmentIdList(equipmentIdList);
+ } else {
+ result.setMdcEfficiencyList(listDtos);
+ return result;
+ }
+
// 鍒╃敤鐜囩瓑绾�
List<MdcUtilizationRate> mdcUtilizationRateList = mdcUtilizationRateService.listByType("lyl");
if ("2".equals(vo.getTypeTree())) {
--
Gitblit v1.9.3