Merge remote-tracking branch 'origin/master'

zhangherong

2025-05-20 024103d7af393486f2bea75f91d9e6c5b8d2a6d4

 lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/service/impl/MdcEquipmentStatisticalShiftInfoServiceImpl.java

@@ -99,6 +99,11 @@
        return this.baseMapper.findByEquipmentAndMonth(equipmentId, date);
    }

    @Override
    public List<MdcEquipmentStatisticalDto> findShiftByEquipmentAndMonth(String equipmentId, String date) {
        return this.baseMapper.findShiftByEquipmentAndMonth(equipmentId, date);
    }

    @Transactional(readOnly = true)
    public List<MdcEquipmentStatisticalShiftInfo> equipmentShiftStatisticalProcess(Equipment equipment, String dateTime) {
        Date initDate = null;