From bd63839391308f261f1d074594221657cef4ed7f Mon Sep 17 00:00:00 2001 From: winter Date: Wed, 28 Aug 2024 19:36:14 +0800 Subject: [PATCH] fix --- .../controller/market/WxEnergyController.java | 11 +++++++ .../controller/WxMallAdminController.java | 30 +++++++++++++++++-- .../com/iformall/service/WxEnergyService.java | 1 + .../service/impl/WxEnergyServiceImpl.java | 6 ++++ 4 files changed, 46 insertions(+), 2 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java index 337e7c5b6..f6ccdd727 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -611,6 +611,17 @@ public class WxEnergyController extends BaseController { @PostMapping("createReadingCalcute") public ResultData createReadingCalcute(@RequestBody WxEnergyReadingCalcute record) { record.updateTenantInfo(getTenantInfo()); + //如果已经存在则不允许 + WxEnergyReadingCalcute rcq = new WxEnergyReadingCalcute(); + rcq.updateTenantInfo(record); + rcq.setPeriod(record.getPeriod()); + rcq.setFeesId(record.getFeesId()); + rcq.setIsDel(EnumYesOrNo.NO.getCode()); + rcq.setShopIds(record.getShopIds()); + List rcList = wxEnergyService.findCalcuteList(rcq); + if (null != rcList && rcList.size() > 0 ) { + return new ResultData(Result.ERROR,"已存在重复数据"); + } wxEnergyService.saveOrUpdateReadingCalcute(record,this.getUser()); return new ResultData(); } diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java index 5c9bfa8f7..ebdf904c2 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMallAdminController.java @@ -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 mids = wxEnergyService.getMeterIdList(sfq); + if (null == mids || mids.size() <= 0 ) { + return new ResultData(); + } + record.setIds(mids); + 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) { record.setIsDel(EnumYesOrNo.NO.getCode()); setQueryDataRule(record); record.setSortColumns(BaseEntity.SortField.CreateTime_DESC); PageInfo 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(); } //能源抄表费用 diff --git a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java index 92034a300..b1ec041c6 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java @@ -77,6 +77,7 @@ public interface WxEnergyService { //抄表科目计算数据 PageInfo readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize); + List findCalcuteList(WxEnergyReadingCalcute record); void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo); PageInfo readingCalcuteResultListAsPage(WxEnergyReadingCalcuteResult record, Integer pageIndex, Integer pageSize); void exportReadingCalcuteResult(WxEnergyReadingCalcuteResult record,HttpServletRequest request, HttpServletResponse response); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java index cf57c504c..b66e546c9 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -879,7 +879,13 @@ public class WxEnergyServiceImpl implements WxEnergyService { } return page; } + + @Override + public List findCalcuteList(WxEnergyReadingCalcute record) { + return wxEnergyReadingCalcuteMapper.findList(record); + } + @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) @Override public void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record, MallUserInfo userInfo) { Date date = new Date();