|
|
|
@@ -390,10 +390,15 @@ public class WxMallAdminController extends BaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
setQueryDataRule(record); |
|
|
|
if (StringUtils.isNotBlank(record.getSearchKey())) { |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(record.getSearchKey()) || null != record.getBuilding() || null != record.getFloor() ) { |
|
|
|
WxShop sq = new WxShop(); |
|
|
|
sq.updateTenantInfo(record); |
|
|
|
sq.setShopNumber(record.getSearchKey()); |
|
|
|
sq.setBuilding(record.getBuilding()); |
|
|
|
sq.setFloor(record.getFloor()); |
|
|
|
if (StringUtils.isNotBlank(record.getSearchKey())) { |
|
|
|
sq.setShopNumber(record.getSearchKey()); |
|
|
|
} |
|
|
|
List<Long> sids = wxShopService.getShopIds(sq); |
|
|
|
if (null != sids && sids.size() > 0 ) { |
|
|
|
record.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); |
|
|
|
@@ -403,15 +408,18 @@ public class WxMallAdminController extends BaseController { |
|
|
|
record.setMeterIds(mids); |
|
|
|
} |
|
|
|
} |
|
|
|
WxEnergyMeter mq = new WxEnergyMeter(); |
|
|
|
mq.updateTenantInfo(record); |
|
|
|
mq.setName(record.getSearchKey()); |
|
|
|
List<Long> mids1 = wxEnergyService.getMeterIdList(mq); |
|
|
|
if (null != mids1 && mids1.size() > 0 ) { |
|
|
|
if (null == record.getMeterIds()) { |
|
|
|
record.setMeterIds(new ArrayList<Long>()); |
|
|
|
} |
|
|
|
record.getMeterIds().addAll(mids1); |
|
|
|
|
|
|
|
if (StringUtils.isNotBlank(record.getSearchKey())) { |
|
|
|
WxEnergyMeter mq = new WxEnergyMeter(); |
|
|
|
mq.updateTenantInfo(record); |
|
|
|
mq.setName(record.getSearchKey()); |
|
|
|
List<Long> mids1 = wxEnergyService.getMeterIdList(mq); |
|
|
|
if (null != mids1 && mids1.size() > 0 ) { |
|
|
|
if (null == record.getMeterIds()) { |
|
|
|
record.setMeterIds(new ArrayList<Long>()); |
|
|
|
} |
|
|
|
record.getMeterIds().addAll(mids1); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
|