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

增加设备信息模型中的设备单位类型字段，并更新相关查询

This commit is contained in:
syruan 2025-09-16 20:14:47 +08:00
parent d5282ab3f8
commit 7964b91188
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/DevInfo.java
View File

@ -72,6 +72,9 @@ public class DevInfo extends BaseEntity {
@ApiModelProperty(value = "设备数量")
private Integer deviceCount;
@ApiModelProperty(value = "设备单位，例如（台）")
private String deviceUnitType;
@ApiModelProperty(value = "比率的范围,比如: x%-y%")
private String ratioRange;

14
bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml
View File

@ -59,6 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_name as deviceName,
d.device_weight as deviceWeight,
d.device_count as deviceCount,
d.device_unit_type as deviceUnitType,
d.type_id as typeId,
mt4.type_name as typeName,
mt4.unit_name as unitName,
@ -235,6 +236,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
d.device_name as deviceName,
d.device_weight as deviceWeight,
d.device_count as deviceCount,
d.device_unit_type as deviceUnitType,
d.type_id as typeId,
d.check_date as checkDate,
d.check_cycle as checkCycle,
@ -304,6 +306,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceName != null and deviceName != '' ">device_name,</if>
<if test="deviceWeight != null and deviceWeight != '' ">device_weight,</if>
<if test="deviceCount != null">device_count,</if>
<if test="deviceUnitType != null and deviceUnitType != ''">device_unit_type,</if>
<if test="code != null and code != '' ">code,</if>
<if test="identifyCode != null and identifyCode != '' ">identify_code,</if>
<if test="typeId != null and typeId != ''">type_id,</if>
@ -326,18 +329,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null and companyId != ''">own_co,</if>
<if test="person != null and person != ''">person,</if>
<if test="personPhone != null and personPhone != ''">person_phone,</if>
<if test="levelType != null and levelType != ''">level_type</if>
<if test="levelType != null and levelType != ''">level_type,</if>
<if test="assetValue != null and assetValue != ''">assetValue,</if>
<if test="purchaseSource != null and purchaseSource != ''">purchaseSource,</if>
create_time,
<if test="creator != null and creator != ''">creator,</if>
update_time,
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="updateBy != null and updateBy != ''">updateBy,</if>
<if test="specification != null and specification != ''">specification,</if>
<if test="deposit != null and deposit != ''">deposit,</if>
<if test="isOperator != null and isOperator != ''">is_operator,</if>
<if test="isActive != null and isActive != ''">is_active,</if>
<if test="updateBy != null and updateBy != ''">update_by,</if>
<if test="ownId != null">own_id,</if>
<if test="checkDate != null">check_date,</if>
<if test="checkCycle != null">check_cycle,</if>
@ -352,6 +354,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
<if test="deviceWeight != null and deviceWeight != ''">#{deviceWeight},</if>
<if test="deviceCount != null">#{deviceCount},</if>
<if test="deviceUnitType != null and deviceUnitType != ''">#{deviceUnitType},</if>
<if test="code != null and code != ''">#{code},</if>
<if test="identifyCode != null and identifyCode != ''">#{identifyCode},</if>
<if test="typeId != null and typeId != ''">#{typeId},</if>
@ -374,18 +377,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="companyId != null and companyId != ''">#{companyId},</if>
<if test="person != null and person != ''">#{person},</if>
<if test="personPhone != null and personPhone != ''">#{personPhone},</if>
<if test="levelType != null and levelType != ''">#{levelType}</if>
<if test="levelType != null and levelType != ''">#{levelType},</if>
<if test="assetValue != null and assetValue != ''">#{assetValue},</if>
<if test="purchaseSource != null and purchaseSource != ''">#{purchaseSource},</if>
now(),
<if test="creator != null and creator != ''">#{creator},</if>
now(),
<if test="updateBy != null and updateBy != ''">#{update_by},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="specification != null and specification != ''">#{specification},</if>
<if test="deposit != null and deposit != ''">#{deposit},</if>
<if test="isOperator != null and isOperator != ''">#{isOperator},</if>
<if test="isActive != null and isActive != ''">#{isActive},</if>
<if test="updateBy != null and updateBy != ''">#{updateBy},</if>
<if test="ownId != null">#{ownId},</if>
<if test="checkDate != null">#{checkDate},</if>
<if test="checkCycle != null">#{checkCycle},</if>