From aec08e3c84590f50f5673a24ce9367f82bdb872c Mon Sep 17 00:00:00 2001 From: lius <Lius2225@163.com> Date: 星期四, 07 九月 2023 10:53:26 +0800 Subject: [PATCH] 报警号分析列表 --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentRepairServiceImpl.java | 11 ++++++++++- 1 files changed, 10 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 4e1c90c..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 @@ -156,8 +156,12 @@ } } - if (repair.getMdcSectionIds().isEmpty()) { + 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); @@ -235,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