Merge remote-tracking branch 'origin/master'

luodangjia

2025-01-01 2dc478231fd09a88a4d86d44388ae807aca08bc5

 medicalWaste-system/src/main/java/com/sinata/system/service/impl/MwStagingRoomServiceImpl.java

@@ -83,6 +83,8 @@
        if (Objects.isNull(dto.getId())) {
            throw new ServiceException("暂存间id不能为空");
        }
        MwStagingRoom mwStagingRoom = BeanUtils.copyBean(dto, MwStagingRoom.class);
        updateById(mwStagingRoom);
    }

    /**
@@ -172,4 +174,31 @@
        response.setHeader("Content-disposition", "attachment;filename*=utf-8''" + fileName + ".xlsx");
        FastExcel.write(response.getOutputStream(), MwCheckoutRecordVO.class).sheet("暂存间出库记录").doWrite(list);
    }

    @Override
    public List<MwStagingRoomVO> queryStagingRoomList() {
        return baseMapper.queryStagingRoomList();
    }

    /**
     * 暂存间待处理医废分页列表
     *
     * @param query
     * @return
     */
    @Override
    public PageDTO<MwStorageRecordVO> temporarilyStoredMedicalWaste(StorageRecordQuery query) {
        return PageDTO.of(baseMapper.temporarilyStoredMedicalWaste(query));
    }

    /**
     * 根据医废查询使用列表
     *
     * @param id 微波设备id
     * @return
     */
    @Override
    public List<MwStorageRecordVO> queryMedicalWasteList(Long id) {
        return baseMapper.queryMedicalWasteList(id);
    }
}