diff --git a/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java b/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java index ebff2a5ee..3b21fe179 100644 --- a/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java +++ b/op-modules/op-energy/src/main/java/com/op/energy/record/service/impl/RecordDnbInstantServiceImpl.java @@ -325,7 +325,7 @@ public class RecordDnbInstantServiceImpl implements IRecordDnbInstantService { for (RecordDnbInstant item : list) { BaseMonitorInfo temp = new BaseMonitorInfo(); - temp.setConnCode(item.getMonitorId()); + temp.setAddressCode(item.getMonitorId()); List baseList = baseMonitorInfoMapper.selectBaseMonitorInfoList(temp); for (BaseMonitorInfo base : baseList) { item.setMonitorId(base.getMonitorId()); diff --git a/op-modules/op-energy/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml b/op-modules/op-energy/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml index b792d0788..f6c8a6a94 100644 --- a/op-modules/op-energy/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml +++ b/op-modules/op-energy/src/main/resources/mapper/base/BaseMonitorInfo1Mapper.xml @@ -39,12 +39,13 @@ + select objid, parent_id, monitor_id, monitor_name, monitor_addr, monitor_type, monitor_status, collect_device_id, ancestors, grade, build_id, subentry_id, business_id, meter_type_id, - meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id, + meter_id, correct_value, pt, ct, is_ammeter, is_key_monitor, is_circuit, dept_id, user_id, electricity_meter_type, create_by, create_time, update_by, update_time, public_share_type,monitor_hierarchy,room_code,room_name,physical_code,address_code, conn_code from base_monitor_info @@ -150,6 +151,7 @@ physical_code, address_code, conn_code, + electricity_meter_type, #{parentId}, @@ -185,6 +187,7 @@ #{physicalCode}, #{addressCode}, #{connCode}, + #{electricityMeterType}, @@ -224,6 +227,7 @@ physical_code = #{physicalCode}, address_code = #{addressCode}, conn_code = #{connCode}, + electricity_meter_type = #{electricityMeterType}, where objid = #{objid}