From 2d061ec924b4b55ea825bfb0ea5b602cc4f8b94b Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期三, 02 八月 2023 10:13:34 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEfficiencyReportServiceImpl.java | 6 +++---
1 files changed, 3 insertions(+), 3 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 30b6fd4..6cedc45 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
@@ -887,7 +887,9 @@
vo.setEquipmentId(equipmentIds.get(0));
}
}
-
+ result.setEquipmentId(vo.getEquipmentId());
+ MdcEquipment mdcEquipment = mdcEquipmentService.getOne(new LambdaQueryWrapper<MdcEquipment>().eq(MdcEquipment::getEquipmentId, vo.getEquipmentId()));
+ result.setEquipmentName(mdcEquipment.getEquipmentName());
List<String> dateList = new ArrayList<>();
for (int i = 1; i <= 24 / vo.getTimeType(); i++) {
if (i * vo.getTimeType() < 10) {
@@ -896,8 +898,6 @@
dateList.add(i * vo.getTimeType() + ":00");
}
}
-
-// result.setDateList(dateList);
dateList.add(0, "00:00");
--
Gitblit v1.9.3