diff --git a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java index d2685f06e..768c8772a 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/KwMeter.java @@ -87,9 +87,10 @@ public class KwMeter extends BaseEntity { private Integer bandrate; @Excel(name = "商户", width = 20, orderNum = "8") - @Transient private String merchantName; + private Long merchantId; + @Transient private Integer merchantMeterStatus; diff --git a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml index 6d85a1621..bf64b939b 100644 --- a/mallinkService/src/main/resources/mapper/KwMeterMapper.xml +++ b/mallinkService/src/main/resources/mapper/KwMeterMapper.xml @@ -17,64 +17,69 @@ + + + - `id`,`tenant_id`,`address`,`brand`,`model`,`place`,`last_online_time`,`total_power`,`online_status`,`config`,`create_time`,`update_time`,`box_id`,`status`,`bind_status` + `kw_meter`.`id`,`kw_meter`.`tenant_id`,`kw_meter`.`address`,`kw_meter`.`brand`,`kw_meter`.`model`, + `kw_meter`.`place`,`kw_meter`.`last_online_time`,`kw_meter`.`total_power`,`kw_meter`.`online_status`, + `kw_meter`.`config`,`kw_meter`.`create_time`,`kw_meter`.`update_time`,`kw_meter`.`box_id`,`kw_meter`.`status`,`kw_meter`.`bind_status` where 1 = 1 - and `id` = #{id} + and `kw_meter`.`id` = #{id} - and `tenant_id` = #{tenantId} + and `kw_meter`.`tenant_id` = #{tenantId} - and `address` like concat('%', #{address},'%') + and `kw_meter`.`address` like concat('%', #{address},'%') - and `brand` like concat('%', #{brand},'%') + and `kw_meter`.`brand` like concat('%', #{brand},'%') - and `place` like concat('%', #{place},'%') + and `kw_meter`.`place` like concat('%', #{place},'%') - and `model` = #{model} + and `kw_meter`.`model` = #{model} - and `online_status` = #{onlineStatus} + and `kw_meter`.`online_status` = #{onlineStatus} - and `box_id` = #{boxId} + and `kw_meter`.`box_id` = #{boxId} - and `status` = #{status} + and `kw_meter`.`status` = #{status} - and `bind_status` = #{bindStatus} + and `kw_meter`.`bind_status` = #{bindStatus} - and `id` not in (select meter_id from kw_merchant_meter where status = 0) + and `kw_meter`.`id` not in (select meter_id from kw_merchant_meter where status = 0) - and `id` in (select meter_id from kw_merchant_meter where status = 0) + and `kw_meter`.`id` in (select meter_id from kw_merchant_meter where status = 0) - and id in + and `kw_meter`.id in #{idItem} @@ -85,7 +90,10 @@