Ver a proveniência

fix

release_toaliyun_real
winter há 1 ano
ascendente
cometimento
223a756a7b
2 ficheiros alterados com 23 adições e 11 eliminações
  1. +19
    -11
      mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java
  2. +4
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java

+ 19
- 11
mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java Ver ficheiro

@@ -390,10 +390,15 @@ public class WxMallAdminController extends BaseController {
return new ResultData(); return new ResultData();
} }
setQueryDataRule(record); setQueryDataRule(record);
if (StringUtils.isNotBlank(record.getSearchKey())) {
if (StringUtils.isNotBlank(record.getSearchKey()) || null != record.getBuilding() || null != record.getFloor() ) {
WxShop sq = new WxShop(); WxShop sq = new WxShop();
sq.updateTenantInfo(record); 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); List<Long> sids = wxShopService.getShopIds(sq);
if (null != sids && sids.size() > 0 ) { if (null != sids && sids.size() > 0 ) {
record.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); record.setType(EnumEnergyMeterShopFloorType.SHOP.getCode());
@@ -403,15 +408,18 @@ public class WxMallAdminController extends BaseController {
record.setMeterIds(mids); 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); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC);


+ 4
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxEnergyMeterShopFloor.java Ver ficheiro

@@ -70,5 +70,9 @@ public class WxEnergyMeterShopFloor extends TenantEntity {
private String searchKey; private String searchKey;
@TableField(exist = false) @TableField(exist = false)
private List<Long> meterIds; private List<Long> meterIds;
@TableField(exist = false)
private Long building;
@TableField(exist = false)
private Long floor;
} }

Carregando…
Cancelar
Guardar