bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
itcast 2025-12-17 10:42:20 +08:00
parent 1bc344980e
commit a7c05d744d
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/devchange/domain/MaDevInfo.java
View File

@ -239,14 +239,14 @@ public class MaDevInfo {
* 最小资产原值（元） * 最小资产原值（元）
* 说明：装备的原始采购价值，以元为单位 * 说明：装备的原始采购价值，以元为单位
*/ */
private BigDecimal minOriginalValue; private BigDecimal minBuyPrice;
/** /**
* 最大资产原值（元） * 最大资产原值（元）
* 说明：装备的原始采购价值，以元为单位 * 说明：装备的原始采购价值，以元为单位
*/ */
private BigDecimal maxOriginalValue; private BigDecimal maxBuyPrice;
/** /**
* 最大使用年限（年） * 最大使用年限（年）

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

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