From a625e025f77e2c1fd9424b9da1444e5a75c522db Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期四, 03 八月 2023 16:37:20 +0800
Subject: [PATCH] 设备利用率分段分析
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java | 15 ++++++++++++++-
1 files changed, 14 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
index 750bb09..3391b4a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java
@@ -155,7 +155,15 @@
equipmentIds = mdcEquipmentService.getEquipmentIdsProduction(userId, null);
}
}
- repair.setMdcSectionIds(equipmentIds);
+
+ if (repair.getMdcSectionIds() == null || repair.getMdcSectionIds().isEmpty()) {
+ repair.setMdcSectionIds(equipmentIds);
+ }
+
+ if (repair.getMdcSectionIds() == null || repair.getMdcSectionIds().isEmpty()) {
+ return null;
+ }
+
return this.baseMapper.pageList(page, repair);
}
@@ -231,4 +239,9 @@
return result;
}
+ @Override
+ public List<MdcEquipmentRepair> mdcRepairListDate(String equipmentid, Date startDate, Date endDate) {
+ return this.baseMapper.selectByIdAndTime(equipmentid, startDate, endDate);
+ }
+
}
\ No newline at end of file
--
Gitblit v1.9.3