feat(device): 新增设备管理方式字段
- 在 DevInfo 类中添加 deviceType 字段,用于表示设备管理方式(0: 编码, 1: 数量)- 在 DevInfoMapper.xml 中添加
This commit is contained in:
parent
5ea33d61e5
commit
4f6c7d6b1a
|
|
@ -68,6 +68,9 @@ public class DevInfo extends BaseEntity {
|
|||
@ApiModelProperty(value = "整机装备重量")
|
||||
private String deviceWeight;
|
||||
|
||||
@ApiModelProperty(value = "设备管理方式: 0编码 1数量")
|
||||
private Byte deviceType;
|
||||
|
||||
@Excel(name = "设备数量")
|
||||
@ApiModelProperty(value = "设备数量")
|
||||
private Integer deviceCount;
|
||||
|
|
|
|||
|
|
@ -227,6 +227,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
d.ma_id as maId,
|
||||
d.code as code,
|
||||
d.buy_price as buyPrice,
|
||||
d.device_type as deviceType,
|
||||
d.item_type_model as itemTypeModel,
|
||||
identify_code as identifyCode,
|
||||
d.device_name as deviceName,
|
||||
|
|
@ -288,6 +289,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="(" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceName != null and deviceName != '' ">device_name,</if>
|
||||
<if test="deviceWeight != null and deviceWeight != '' ">device_weight,</if>
|
||||
<if test="deviceType != null">device_type,</if>
|
||||
<if test="deviceCount != null">device_count,</if>
|
||||
<if test="code != null and code != '' ">code,</if>
|
||||
<if test="identifyCode != null and identifyCode != '' ">identify_code,</if>
|
||||
|
|
@ -331,6 +333,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<trim prefix="values (" suffix=")" suffixOverrides=",">
|
||||
<if test="deviceName != null and deviceName != ''">#{deviceName},</if>
|
||||
<if test="deviceWeight != null and deviceWeight != ''">#{deviceWeight},</if>
|
||||
<if test="deviceType != null">#{deviceType},</if>
|
||||
<if test="deviceCount != null">#{deviceCount},</if>
|
||||
<if test="code != null and code != ''">#{code},</if>
|
||||
<if test="identifyCode != null and identifyCode != ''">#{identifyCode},</if>
|
||||
|
|
|
|||
Loading…
Reference in New Issue