From bdd0875d4b13a3f1ef472f64d4b6a95e0ef64b22 Mon Sep 17 00:00:00 2001 From: cuijian <cuijian@xalxzn.com> Date: 星期六, 19 八月 2023 10:30:33 +0800 Subject: [PATCH] Merge remote-tracking branch 'remotes/origin/develop' --- lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDeviceCalendarMapper.java | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-) diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDeviceCalendarMapper.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDeviceCalendarMapper.java index 4fe2636..4c332a2 100644 --- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDeviceCalendarMapper.java +++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/mapper/MdcDeviceCalendarMapper.java @@ -7,6 +7,9 @@ import org.jeecg.modules.mdc.vo.MdcDeviceCalendarQueryVo; import org.jeecg.modules.mdc.vo.MdcDeviceCalendarVo; +import java.util.Date; +import java.util.List; + /** * @Description: 璁惧宸ヤ綔鏃ュ巻琛� * @Author: jeecg-boot @@ -16,4 +19,9 @@ public interface MdcDeviceCalendarMapper extends BaseMapper<MdcDeviceCalendar> { IPage<MdcDeviceCalendarVo> pageList(IPage<MdcDeviceCalendarVo> pageData, @Param("deviceCalendar") MdcDeviceCalendarQueryVo mdcDeviceCalendarQueryVo); + + List<MdcDeviceCalendarVo> listByEquipmentAndDate(@Param("equipmentId") String equipmentId, @Param("stringDate") String stringDate); + + List<MdcDeviceCalendarVo> findAcquiesceShift(); + } -- Gitblit v1.9.3