diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index dd18086..859ccdc 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -22,9 +22,5 @@ BizBusinessDeviceMeasureInfo selectDetailById(@Param("id") Long id); - String customTemplateUrl(@Param("templateName") String templateName, - @Param("coverModuleName") String coverModuleName, - @Param("descn") String descn); - BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java index dd18086..859ccdc 100644 --- a/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java +++ b/casic-metering-dao/src/main/java/com/casic/missiles/mapper/business/BizBusinessDeviceMeasureInfoMapper.java @@ -22,9 +22,5 @@ BizBusinessDeviceMeasureInfo selectDetailById(@Param("id") Long id); - String customTemplateUrl(@Param("templateName") String templateName, - @Param("coverModuleName") String coverModuleName, - @Param("descn") String descn); - BizBusinessDeviceMeasureInfo selectDetailByItemId(@Param("itemId") Long itemId, @Param("orderId") Long orderId, @Param("sampleId") Long sampleId); } diff --git a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml index 6bdbb20..4624d76 100644 --- a/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/business/BizBusinessDeviceMeasureInfoMapper.xml @@ -60,7 +60,7 @@ - SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_name, + SELECT bbdmi.*, bboi.customer_name, eemi.help_instruction, bbdmii.item_category_id, bbdmii.item_category_name, bbdmii.belong_standard_equipment FROM biz_business_device_measure_info bbdmi JOIN biz_business_device_measure_item_info bbdmii ON bbdmii.id = bbdmi.item_id diff --git a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java index 9c76c9e..30c4697 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/model/business/BizBusinessDeviceMeasureInfo.java @@ -311,6 +311,10 @@ @TableField(exist = false) private String helpInstruction; + @ApiModelProperty(value = "设备检定项分类id(列表参数)", dataType = "String") + @TableField(exist = false) + private String itemCategoryId; + @ExcelProperty(value = "设备检定项分类", order = 9) @NotEmpty(message = "设备检定项分类名字不能为空") @ApiModelProperty(value = "设备检定项分类名字(前端必传)", dataType = "String")