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 078aab7..eb66e48 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 @@ -59,7 +59,7 @@ * @since 2023-10-01 */ @Service -public class BizBusinessDeviceMeasureInfoServiceImpl extends ServiceImpl implements IBizBusinessDeviceMeasureInfoService, PrintFileModuleNameEnum, MeasureCategoryEnum { +public class BizBusinessDeviceMeasureInfoServiceImpl extends ServiceImpl implements IBizBusinessDeviceMeasureInfoService{ @Autowired private BizBusinessDeviceMeasureEquipmentMapper measureEquipmentMapper; @Autowired @@ -76,8 +76,6 @@ private BizBusinessDeviceMeasureModifyRecordMapper measureModifyRecordMapper; @Autowired private BizResourceStaffInfoMapper staffInfoMapper; - @Autowired - private PrintFileRegister printFileRegister; @Override @@ -199,35 +197,6 @@ return ReturnUtil.success(measureInfo); } - private Boolean checkOutUnablePrint(BizBusinessDeviceMeasureInfo measureItemInfo) { - //通过检定项名称,获取对应的模块配置列表 - if (StringUtils.isNotEmpty(measureItemInfo.getItemCategoryName())) { - if (MEASURE_ITEMS_WITHOUT_CERTIFICATE.contains(measureItemInfo.getItemCategoryName())) { - log.warn(BusinessExceptionEnum.ITEM_CATEGORY_NOT_NULL.getMessage()); - return true; - } - if (measureItemInfo.getMeasureCategoryName().equals(TEST_REPORT)) { - log.warn(BusinessExceptionEnum.TEST_CATEGORY_IS_NONE.getMessage()); - return true; - } - } else { - log.warn(BusinessExceptionEnum.ITEM_CATEGORY_IS_NULL.getMessage()); - return true; - } - return false; - } - //证书报告有一部分海口或者西昌的固定数据,例如海口/西昌标志,电话邮箱等地址 - - private List getCustomTemplateUrls(BizBusinessDeviceMeasureInfo measureItemInfo) { - String coverModuleName = "", moduleDescn = ""; - - List customTemplateUrls = new ArrayList<>(); - //这一块逻辑比较复杂 - customTemplateUrls.add(this.baseMapper.customTemplateUrl(MEASURE_DATA, "2", "校准证书")); - customTemplateUrls.add(this.baseMapper.customTemplateUrl(MEASURE_DATA, "2", "数字多用表等记录表")); - return customTemplateUrls; - } - private void queryByStandardEquipmentTypeHandle(BizBusinessDeviceMeasureInfo measureInfo, String belongStandardEquipment) { if (StringUtils.isEmpty(belongStandardEquipment)) { return;