修复人员管理接口校验与导出，完善设备保养计划与文件受控功能

吴羡

昨天 8ad863082097ffdcab4a8e7f426d344a1fe6f892

 cnas-device/src/main/java/com/ruoyi/device/mapper/DeviceRecordMapper.java

@@ -19,7 +19,12 @@
 */
public interface DeviceRecordMapper extends BaseMapper<DeviceRecord> {

    IPage<DeviceRecordDto> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber, @Param("userId") Integer userId);
    IPage<DeviceRecordDto> deviceRecordPage(@Param("deviceId") Integer deviceId, @Param("page") Page page,
                                            @Param("deviceName") String deviceName,
                                            @Param("specificationModel") String specificationModel,
                                            @Param("sampleCode") String sampleCode,
                                            @Param("managementNumber") String managementNumber,
                                            @Param("userId") Integer userId);


    /**
@@ -31,10 +36,15 @@
    /**
     * 查询导出设备使用记录
     * @param deviceId
     * @param deviceName 设备名称筛选
     * @param specificationModel 设备型号筛选
     * @param managementNumber 设备编号筛选
     * @param sampleCode 样品编号筛选
     * @param managementNumber 管理编号筛选
     * @param exportDate
     * @return
     */
    List<DeviceRecordDto> selectExportList(@Param("deviceId") Integer deviceId, @Param("sampleCode") String sampleCode, @Param("managementNumber") String managementNumber, @Param("exportDate") String exportDate);
    List<DeviceRecordDto> selectExportList(@Param("deviceId") Integer deviceId,
                                           @Param("deviceName") String deviceName,
                                           @Param("specificationModel") String specificationModel,
                                           @Param("managementNumber") String managementNumber,
                                           @Param("sampleCode") String sampleCode);
}