设备模块后端业务规则、计划接口与日期联动

吴羡

11 小时以前 2f07589b54d56085af77b50d580890cd4130b444

 cnas-device/src/main/java/com/ruoyi/device/service/impl/DeviceRecordServiceImpl.java

@@ -64,11 +64,11 @@


    @Override
    public void exportUseRecord(Integer deviceId, String exportDate, HttpServletResponse response) {
        // 查询cnas设备使用记录
        List<DeviceRecord> deviceList = baseMapper.selectExportList(deviceId, exportDate);
        // 设备信息
        Device device = deviceMapper.selectById(deviceId);
    public void exportUseRecord(Integer deviceId, String sampleCode, String managementNumber, String exportDate, HttpServletResponse response) {
        // 查询cnas设备使用记录(按当前筛选条件, 条件为空时导出全部)
        List<DeviceRecord> deviceList = baseMapper.selectExportList(deviceId, sampleCode, managementNumber, exportDate);
        // 设备信息(未选中具体设备时导出全部设备的记录, 设备信息留空)
        Device device = deviceId == null ? null : deviceMapper.selectById(deviceId);


        // 查询设备属于哪个实验室
@@ -118,13 +118,13 @@
        Configure configure = Configure.builder()
                .bind("useRecord", new HackLoopTableRenderPolicy())
                .build();
        String deviceName = device.getDeviceName();
        String managementNumber = device.getManagementNumber();
        String deviceName = device == null ? "" : device.getDeviceName();
        String deviceManagementNumber = device == null ? "" : device.getManagementNumber();
        XWPFTemplate template = XWPFTemplate.compile(inputStream, configure).render(
                new HashMap<String, Object>() {{
                    put("useRecord", deviceExportList);
                    put("deviceName", deviceName);
                    put("managementNumber", managementNumber);
                    put("managementNumber", deviceManagementNumber);
                    put("laboratory", laboratoryName);
                }});