| @@ -454,37 +454,6 @@ public class WxMallAdminController extends BaseController { | |||||
| return new ResultData(retMap); | 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<Long> sids = wxShopService.getShopIds(sq); | |||||
| if (null != sids && sids.size() > 0 ) { | |||||
| sfq.setAliseIdList(sids); | |||||
| List<Long> mids = wxEnergyService.getMeterIdList(sfq); | |||||
| if (null != mids && mids.size() > 0 ) { | |||||
| record.setIds(mids); | |||||
| } | |||||
| } | |||||
| record.setOrName(record.getSearchKey()); | |||||
| } | |||||
| record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | |||||
| PageInfo<WxEnergyMeter> page = wxEnergyService.meterListAsPage(record, 1, 1000); | |||||
| return new ResultData(page); | |||||
| } | |||||
| @ApiOperation("抄表数据分页列表接口") | @ApiOperation("抄表数据分页列表接口") | ||||
| @GetMapping("preShopReadingList") | @GetMapping("preShopReadingList") | ||||
| public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { | public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { | ||||