diff --git a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java index 6b0acea..078aab7 100644 --- a/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java +++ b/casic-metering-service/src/main/java/com/casic/missiles/service/Impl/business/BizBusinessDeviceMeasureInfoServiceImpl.java @@ -199,52 +199,6 @@ return ReturnUtil.success(measureInfo); } - - @Override - public void exportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception { - BizBusinessDeviceMeasureInfo measureItemInfo = this.baseMapper.selectDetailById(exportDTO.getId()); - DictCodeUtils.convertDictCodeToName(measureItemInfo); -// queryByStandardEquipmentTypeHandle(measureItemInfo, request.getBelongStandardEquipment()); - //检定数据 - QueryWrapper queryWrapper = new QueryWrapper<>(); - queryWrapper.eq("data_id", measureItemInfo.getId()); - measureItemInfo.setMeasureDataCalibratorList(measureDataCalibratorMapper.selectList(queryWrapper)); - //检验是否具备打印 - if (checkOutUnablePrint(measureItemInfo)) { - return; - } - Long dataId = measureItemInfo.getId(); - List equipmentList = measureEquipmentMapper.selectEquipmentListByDataId(dataId); - //不确定度 - if (!CollectionUtils.isEmpty(equipmentList)) { - equipmentList.forEach(equipment -> { - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq("equipment_no", equipment.getEquipmentNo()); - List technicalTargets = technicalTargetMapper.selectList(wrapper); - if (!CollectionUtils.isEmpty(technicalTargets)) { - List uncertaintyList = technicalTargets.stream().map(BizEquipmentTechnicalTarget::getUncertainty).collect(Collectors.toList()); - equipment.setUncertainty(Joiner.on("\n").join(uncertaintyList)); - } - }); - } - measureItemInfo.setEquipmentList(equipmentList); - Map map = BeanUtil.beanToMap(measureItemInfo); - List customTemplateUrls = getCustomTemplateUrls(measureItemInfo); - //除了选用的模板不一致,模板配置流程是一致的 - printFileRegister.registerPrintFile(MEASURE_DATA, "", null, map, exportDTO.isPdf(), response, customTemplateUrls); - } - - /** - * @param exportDTO - * @param response - * @throws Exception - */ - @Override - public void originalRecordExportFile(ExportDTO exportDTO, HttpServletResponse response) throws Exception { - - } - - private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureInfo measureItemInfo) { //通过检定项名称,获取对应的模块配置列表 if (StringUtils.isNotEmpty(measureItemInfo.getItemCategoryName())) {