|
|
|
@@ -15,7 +15,9 @@ import com.iformall.domain.po.WxAllBill; |
|
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
|
import com.iformall.domain.po.WxCouponOrder; |
|
|
|
import com.iformall.domain.po.WxEnergyFeesTime; |
|
|
|
import com.iformall.domain.po.WxEnergyMeter; |
|
|
|
import com.iformall.domain.po.WxEnergyMeterReading; |
|
|
|
import com.iformall.domain.po.WxEnergyMeterShopFloor; |
|
|
|
import com.iformall.domain.po.WxFlowModel; |
|
|
|
import com.iformall.domain.po.WxMallBuilding; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
@@ -34,6 +36,7 @@ import com.iformall.enums.EnumBillOweOrNearType; |
|
|
|
import com.iformall.enums.EnumBillUpdateType; |
|
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
import com.iformall.enums.EnumEnergyMeterShopFloorType; |
|
|
|
import com.iformall.enums.EnumEnergyMeterType; |
|
|
|
import com.iformall.enums.EnumFilterSettle; |
|
|
|
import com.iformall.enums.EnumFlowKey; |
|
|
|
@@ -379,13 +382,36 @@ public class WxMallAdminController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("抄表数据分页列表接口") |
|
|
|
@GetMapping("readingList") |
|
|
|
@GetMapping("shopMeterList") |
|
|
|
public ResultData shopMeterList(@ModelAttribute WxEnergyMeter record) { |
|
|
|
record.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
setQueryDataRule(record); |
|
|
|
|
|
|
|
WxEnergyMeterShopFloor sfq = new WxEnergyMeterShopFloor(); |
|
|
|
sfq.updateTenantInfo(record); |
|
|
|
sfq.setType(EnumEnergyMeterShopFloorType.SHOP.getCode()); |
|
|
|
sfq.setAliseId(record.getShopId()); |
|
|
|
List<Long> mids = wxEnergyService.getMeterIdList(sfq); |
|
|
|
if (null == mids || mids.size() <= 0 ) { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
record.setIds(mids); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
PageInfo<WxEnergyMeter> page = wxEnergyService.meterListAsPage(record, 1, 1000); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation("抄表数据分页列表接口") |
|
|
|
@GetMapping("preShopReadingList") |
|
|
|
public ResultData readingList(@ModelAttribute WxEnergyMeterReading record) { |
|
|
|
record.setIsDel(EnumYesOrNo.NO.getCode()); |
|
|
|
setQueryDataRule(record); |
|
|
|
record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); |
|
|
|
PageInfo<WxEnergyMeterReading> page = wxEnergyService.readingListAsPage(record, 1, 1000); |
|
|
|
return new ResultData(page); |
|
|
|
if (null != page && null != page.getList() && page.getList().size() > 0 ) { |
|
|
|
return new ResultData(page.getList().get(0)); |
|
|
|
} |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
//能源抄表费用 |
|
|
|
|