diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java
index cb47f76..de5c5e6 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java
@@ -239,14 +239,14 @@ public class MaDevInfo {
* 最小资产原值(元)
* 说明:装备的原始采购价值,以元为单位
*/
- private BigDecimal minOriginalValue;
+ private BigDecimal minBuyPrice;
/**
* 最大资产原值(元)
* 说明:装备的原始采购价值,以元为单位
*/
- private BigDecimal maxOriginalValue;
+ private BigDecimal maxBuyPrice;
/**
* 最大使用年限(年)
diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml
index 0f2b93f..1ed1643 100644
--- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml
+++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml
@@ -570,10 +570,10 @@
- and mdi.brand = #{manufacturerId}
+ and mdi.supplier_id = #{manufacturerId}
-
- and mdi.buy_price >= #{minOriginalValue} and mdi.buy_price <= #{maxOriginalValue}
+
+ and mdi.buy_price >= #{minBuyPrice} and mdi.buy_price <= #{maxBuyPrice}
and DATE_FORMAT(mdi.production_date,'%Y-%m-%d') between #{startProductionDate} and #{endProductionDate}
@@ -587,6 +587,9 @@
and cds.create_user like concat('%', #{orderCreateUser}, '%')
+
+ and mdi.change_status = #{status}
+