From 7e4933fc6d5c9fe54622a186c7a8bfa388594984 Mon Sep 17 00:00:00 2001 From: winter Date: Sun, 1 Sep 2024 14:27:15 +0800 Subject: [PATCH] fix --- .../controller/WxMallAdminController.java | 31 ------------------- 1 file changed, 31 deletions(-) diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index e66a2d2c6..f57e3f49a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -454,37 +454,6 @@ public class WxMallAdminController extends BaseController { return new ResultData(retMap); } - - @ApiOperation("查询抄表时间") - @GetMapping("shopMeterList") - public ResultData shopMeterList(@ModelAttribute WxEnergyMeter record) { - if (StringUtils.isBlank(record.getSearchKey())) { - return new ResultData(); - } - record.setIsDel(EnumYesOrNo.NO.getCode()); - setQueryDataRule(record); - if (StringUtils.isNotBlank(record.getSearchKey())) { - WxEnergyMeterShopFloor sfq = new WxEnergyMeterShopFloor(); - sfq.updateTenantInfo(record); - sfq.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); - WxShop sq = new WxShop(); - sq.updateTenantInfo(record); - sq.setShopNumber(record.getSearchKey()); - List sids = wxShopService.getShopIds(sq); - if (null != sids && sids.size() > 0 ) { - sfq.setAliseIdList(sids); - List mids = wxEnergyService.getMeterIdList(sfq); - if (null != mids && mids.size() > 0 ) { - record.setIds(mids); - } - } - record.setOrName(record.getSearchKey()); - } - record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); - PageInfo page = wxEnergyService.meterListAsPage(record, 1, 1000); - return new ResultData(page); - } - @ApiOperation("抄表数据分页列表接口") @GetMapping("preShopReadingList") public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) {