代码提交

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;
 
     /**
      * 最大使用年限（年）

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevMergeMapper.xml

@@ -570,10 +570,10 @@
             </if>
 
             <if test="manufacturerId != null and manufacturerId != ''">
-                and mdi.brand = #{manufacturerId}
+                and mdi.supplier_id = #{manufacturerId}
             </if>
-            <if test="minOriginalValue != null and minOriginalValue != '' and maxOriginalValue != null and maxOriginalValue != ''">
-                and mdi.buy_price &gt;= #{minOriginalValue} and mdi.buy_price &lt;= #{maxOriginalValue}
+            <if test="minBuyPrice != null  and maxBuyPrice != null">
+                and mdi.buy_price &gt;= #{minBuyPrice} and mdi.buy_price &lt;= #{maxBuyPrice}
             </if>
             <if test="startProductionDate != null and endProductionDate != null ">
                 and DATE_FORMAT(mdi.production_date,'%Y-%m-%d') between #{startProductionDate} and #{endProductionDate}
@@ -587,6 +587,9 @@
             <if test="orderCreateUser != null and orderCreateUser != ''">
                 and cds.create_user like concat('%', #{orderCreateUser}, '%')
             </if>
+            <if test="status != null ">
+                and mdi.change_status = #{status}
+            </if>
         </where>
     </select>
     <select id="listAllProfessionNames" resultType="java.lang.String">