diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java index 36bf991..bea11f4 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/domain/vo/DevInfoVo.java @@ -160,5 +160,8 @@ public class DevInfoVo extends DevInfo { @ApiModelProperty(value = "检修预报警天数") private String maintenanceAlarmDay; + @ApiModelProperty(value = "原值") + private String originaValue; + } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index 44f5963..a420fd4 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -41,11 +41,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + select ma_id, device_name, device_weight, device_count, code, identify_code, type_id, ma_status, lease_scope, location, province_id, city_id, area_id, brand, model_name, production_date, working_hours, serial_number, - pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time, + pic_url, js_month_price, js_day_price, description, gps_code, own_co, create_time,origina_value, creator, update_time, person, person_phone, update_by, specification, deposit, is_operator, is_active, update_time, update_by from ma_dev_info @@ -72,6 +73,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.person_phone as personPhone, d.create_time as createTime, d.update_time as updateTime, + d.origina_value as originaValue, d.own_co as companyId, sd.dept_name as companyName, c.operate_address as operateAddress, @@ -189,6 +191,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" mt4.lease_price as dayLeasePrice, d.person as person, d.person_phone as personPhone, + d.origina_value as originaValue, d.own_co as companyId, sd.dept_name as companyName, c.operate_address as operateAddress, @@ -225,6 +228,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" d.device_weight as deviceWeight, d.device_count as deviceCount, d.type_id as typeId, + d.origina_value as originaValue, d.check_date as checkDate, d.check_cycle as checkCycle, mt4.type_name as typeName, @@ -278,6 +282,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ma_dev_info device_name, + origina_value, device_weight, device_count, code, @@ -317,6 +322,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" #{deviceName}, + #{originaValue}, #{deviceWeight}, #{deviceCount}, #{code}, @@ -386,6 +392,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" city_id = #{cityId}, area_id = #{areaId}, brand = #{brand}, + origina_value = #{originaValue}, model_name = #{modelName}, production_date = #{productionDate}, working_hours = #{workingHours}, @@ -614,6 +621,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" insert into ma_dev_info device_name, + origina_value, device_weight, device_count, code,