From 848e5624f3a814763e81db5d79d8f0761c5bb4f1 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期四, 01 二月 2024 10:25:40 +0800
Subject: [PATCH] 设备管理按照车间筛选和导出

---
 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
index 90a7462..238de3a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcDeviceCalendarServiceImpl.java
@@ -165,6 +165,7 @@
      */
     @Override
     public BigDecimal computeShiftTimeCount(String equipmentId, String validDate) {
+        validDate = validDate.replaceAll("-", "");
         Integer shiftCount = this.baseMapper.computeShiftTimeCount(equipmentId, validDate);
         return new BigDecimal(shiftCount).multiply(new BigDecimal("8")).multiply(new BigDecimal("60"));
     }
@@ -209,4 +210,9 @@
         return this.baseMapper.getFirstData(equipmentId);
     }
 
+    @Override
+    public List<MdcDeviceCalendarVo> listByEquipmentIdAndDate(String equipmentId, String date) {
+        return this.baseMapper.listByEquipmentAndDate(equipmentId, date);
+    }
+
 }

--
Gitblit v1.9.3