diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index cc6ebd9..bb93eb3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -78,6 +78,9 @@ and mfa.is_fixed_assets = #{fixedAssetRequest.isFixedAssets} + + and mfa.label_bind = #{fixedAssetRequest.labelId} + and mfa.id in diff --git a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml index cc6ebd9..bb93eb3 100644 --- a/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml +++ b/casic-metering-dao/src/main/resources/mapper/equipment/EquipmentFixedAssetsMapper.xml @@ -78,6 +78,9 @@ and mfa.is_fixed_assets = #{fixedAssetRequest.isFixedAssets} + + and mfa.label_bind = #{fixedAssetRequest.labelId} + and mfa.id in diff --git a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java index 834a25a..6907e9c 100644 --- a/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java +++ b/casic-metering-model/src/main/java/com/casic/missiles/dto/equipment/FixedAssetRequest.java @@ -138,4 +138,10 @@ @ApiModelProperty(value = "导出ids", dataType = "List") private List ids; + /** + * 扫描标签id + */ + @ApiModelProperty(value = "扫描标签id", dataType = "List") + private String labelId; + }