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 cea22d93c..5eda265a4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxEnergyController.java @@ -324,7 +324,7 @@ public class WxEnergyController extends BaseController { @ApiOperation("用户能源表新增修改") @PostMapping("deleteChildMeter") - public ResultData deleteChildMeter(@RequestBody WxEnergyMeterChild record) { + public ResultData deleteChildMeter(@RequestBody WxEnergyMeter record) { record.updateTenantInfo(getTenantInfo()); if (null == record.getId()) { return new ResultData(Result.ERROR,"请选择一个关联"); @@ -654,19 +654,15 @@ public class WxEnergyController extends BaseController { } @ApiOperation("科目抄表计算记录导出") - @GetMapping("readingCalcuteExport") - public void readingCalcuteExport(@ModelAttribute WxEnergyReadingCalcute record, HttpServletRequest request, HttpServletResponse response) { -// record.updateTenantInfo(getTenantInfo()); -// WxEnergyReadingCalcute wrc = wxEnergyService.getReadingCalcuteById(record); -// if (null == wrc) { -// return; -// } -// wxEnergyService.exportReadingCalcute(wrc, request, response); + @GetMapping("readingCalcuteResultExport") + public void readingCalcuteResultExport(@ModelAttribute WxEnergyReadingCalcuteResult record, HttpServletRequest request, HttpServletResponse response) { + record.updateTenantInfo(getTenantInfo()); + wxEnergyService.exportReadingCalcuteResult(record, request, response); } - @ApiOperation("计算") - @PostMapping("calcute") - public ResultData calcute(@RequestBody WxEnergyReadingCalcute record) { + @ApiOperation("生成账单") + @PostMapping("createBill") + public ResultData createBill(@RequestBody WxEnergyReadingCalcute record) { // record.updateTenantInfo(getTenantInfo()); // WxEnergyReadingCalcute wrc = wxEnergyService.getReadingCalcuteById(record); // if (null == wrc) { diff --git a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java index ff3479575..5b713441f 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxEnergyService.java @@ -33,7 +33,7 @@ public interface WxEnergyService { void createMeterAlias(WxEnergyMeterShopFloor record); void createChildMeterAlias(WxEnergyMeterChild record); void deleteMeterAlias(WxEnergyMeterShopFloor record); - void deleteChildMeterAlias(WxEnergyMeterChild record); + void deleteChildMeterAlias(WxEnergyMeter record); void updateMeterIsDel(WxEnergyMeter record); Map getMeterMap(WxEnergyMeter record); List getMeterIdList(WxEnergyMeterShopFloor record); @@ -79,7 +79,7 @@ public interface WxEnergyService { PageInfo readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize); void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo); PageInfo readingCalcuteResultListAsPage(WxEnergyReadingCalcuteResult record, Integer pageIndex, Integer pageSize); - void exportReadingCalcute(WxEnergyReadingCalcute record,HttpServletRequest request, HttpServletResponse response); + void exportReadingCalcuteResult(WxEnergyReadingCalcuteResult record,HttpServletRequest request, HttpServletResponse response); Integer calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user); void setReadingCalcuteIsDel(WxEnergyReadingCalcute record); List getReadingCalcuteShopNumber(WxEnergyReadingCalcute record); 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 aaacadd3a..a51320239 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxEnergyServiceImpl.java @@ -13,6 +13,7 @@ import com.iformall.common.ResultData; import com.iformall.domain.dto.FloorBuildingIdDTO; import com.iformall.domain.po.*; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.domain.vo.WxMerchantBillVo; import com.iformall.enums.EnumBillAllType; import com.iformall.enums.EnumEnergyMeterPhysicsType; import com.iformall.enums.EnumEnergyMeterShopFloorType; @@ -231,8 +232,30 @@ public class WxEnergyServiceImpl implements WxEnergyService { } @Override - public void deleteChildMeterAlias(WxEnergyMeterChild record) { - wxEnergyMeterChildMapper.deleteByCondition(record); + public void deleteChildMeterAlias(WxEnergyMeter record) { + if (record.getTreeParentType().equals("building")) { + WxEnergyMeterShopFloor sf = new WxEnergyMeterShopFloor(); + sf.updateTenantInfo(record); + sf.setType(EnumEnergyMeterShopFloorType.BUILDING.getCode()); + sf.setAliseId(record.getTreeParentId()); + sf.setMeterId(record.getId()); + wxEnergyMeterShopFloorMapper.deleteByConditon(sf); + }if (record.getTreeParentType().equals("floor")) { + WxEnergyMeterShopFloor sf = new WxEnergyMeterShopFloor(); + sf.updateTenantInfo(record); + sf.setType(EnumEnergyMeterShopFloorType.FLOOR.getCode()); + sf.setAliseId(record.getTreeParentId()); + sf.setMeterId(record.getId()); + wxEnergyMeterShopFloorMapper.deleteByConditon(sf); + }if (record.getTreeParentType().equals("meter")) { + WxEnergyMeterChild sf = new WxEnergyMeterChild(); + sf.updateTenantInfo(record); + sf.setParentMeterId(record.getTreeParentId()); + sf.setChildMeterId(record.getId()); + wxEnergyMeterChildMapper.deleteByCondition(sf); + } + + } @Override @@ -1011,38 +1034,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { @Override - public void exportReadingCalcute(WxEnergyReadingCalcute record, HttpServletRequest request, HttpServletResponse response) { -// WxEnergyFeesTime tq = new WxEnergyFeesTime(); -// tq.updateTenantInfo(record); -// tq.setId(record.getTimeId()); -// WxEnergyFeesTime time = this.getFeesTimeById(tq); -// if (null == time) { -// return; -// } -// -// WxEnergyFees fq = new WxEnergyFees(); -// fq.updateTenantInfo(record); -// fq.setId(record.getFeesId()); -// WxEnergyFees fees = this.getFeesById(fq); -// if (null == fees) { -// return; -// } -// -// Map buildingMap = wxMallBuildingService.getBuildingMap(record); -// Map floorMap = wxMallFloorService.getFloorMap(record); -// -// List> execlList = new ArrayList>(); -// WxEnergyMeterReading rq = new WxEnergyMeterReading(); -// rq.updateTenantInfo(record); -// //rq.setTimeId(tq.getId()); -// PageInfo page = this.readingListAsPage(rq, 1, 10000); -// if (null != page && null != page.getList()) { -// for (int i = 0 ; i < page.getList().size(); i++) { -// WxEnergyMeterReading r = page.getList().get(i); -// execlList.add(r.generateExcelData(buildingMap, floorMap, time, fees, record)); -// } -// } -// excelService.exportExcel(WxEnergyMeterReading.generateExcelTitle(),execlList, "科目抄表_"+time.getName()+"_"+fees.getName()+".xlsx","sheet1", response); + public void exportReadingCalcuteResult(WxEnergyReadingCalcuteResult record, HttpServletRequest request, HttpServletResponse response) { + PageInfo page = readingCalcuteResultListAsPage(record, 1, 10000); + excelService.exportExcel(page.getList(), null, "能源计算结果", WxEnergyReadingCalcuteResult.class, "能源计算结果.xlsx", response, false); } private File handlerImportFile(MultipartFile mFile,String fileNamePre) {