| @@ -324,7 +324,7 @@ public class WxEnergyController extends BaseController { | |||||
| @ApiOperation("用户能源表新增修改") | @ApiOperation("用户能源表新增修改") | ||||
| @PostMapping("deleteChildMeter") | @PostMapping("deleteChildMeter") | ||||
| public ResultData deleteChildMeter(@RequestBody WxEnergyMeterChild record) { | |||||
| public ResultData deleteChildMeter(@RequestBody WxEnergyMeter record) { | |||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| if (null == record.getId()) { | if (null == record.getId()) { | ||||
| return new ResultData(Result.ERROR,"请选择一个关联"); | return new ResultData(Result.ERROR,"请选择一个关联"); | ||||
| @@ -654,19 +654,15 @@ public class WxEnergyController extends BaseController { | |||||
| } | } | ||||
| @ApiOperation("科目抄表计算记录导出") | @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()); | // record.updateTenantInfo(getTenantInfo()); | ||||
| // WxEnergyReadingCalcute wrc = wxEnergyService.getReadingCalcuteById(record); | // WxEnergyReadingCalcute wrc = wxEnergyService.getReadingCalcuteById(record); | ||||
| // if (null == wrc) { | // if (null == wrc) { | ||||
| @@ -33,7 +33,7 @@ public interface WxEnergyService { | |||||
| void createMeterAlias(WxEnergyMeterShopFloor record); | void createMeterAlias(WxEnergyMeterShopFloor record); | ||||
| void createChildMeterAlias(WxEnergyMeterChild record); | void createChildMeterAlias(WxEnergyMeterChild record); | ||||
| void deleteMeterAlias(WxEnergyMeterShopFloor record); | void deleteMeterAlias(WxEnergyMeterShopFloor record); | ||||
| void deleteChildMeterAlias(WxEnergyMeterChild record); | |||||
| void deleteChildMeterAlias(WxEnergyMeter record); | |||||
| void updateMeterIsDel(WxEnergyMeter record); | void updateMeterIsDel(WxEnergyMeter record); | ||||
| Map<Long,WxEnergyMeter> getMeterMap(WxEnergyMeter record); | Map<Long,WxEnergyMeter> getMeterMap(WxEnergyMeter record); | ||||
| List<Long> getMeterIdList(WxEnergyMeterShopFloor record); | List<Long> getMeterIdList(WxEnergyMeterShopFloor record); | ||||
| @@ -79,7 +79,7 @@ public interface WxEnergyService { | |||||
| PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize); | PageInfo<WxEnergyReadingCalcute> readingCalcuteListAsPage(WxEnergyReadingCalcute record, Integer pageIndex, Integer pageSize); | ||||
| void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo); | void saveOrUpdateReadingCalcute(WxEnergyReadingCalcute record,MallUserInfo userInfo); | ||||
| PageInfo<WxEnergyReadingCalcuteResult> readingCalcuteResultListAsPage(WxEnergyReadingCalcuteResult record, Integer pageIndex, Integer pageSize); | PageInfo<WxEnergyReadingCalcuteResult> 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); | Integer calcuteReading(WxEnergyReadingCalcute record, MallUserInfo user); | ||||
| void setReadingCalcuteIsDel(WxEnergyReadingCalcute record); | void setReadingCalcuteIsDel(WxEnergyReadingCalcute record); | ||||
| List<String> getReadingCalcuteShopNumber(WxEnergyReadingCalcute record); | List<String> getReadingCalcuteShopNumber(WxEnergyReadingCalcute record); | ||||
| @@ -13,6 +13,7 @@ import com.iformall.common.ResultData; | |||||
| import com.iformall.domain.dto.FloorBuildingIdDTO; | import com.iformall.domain.dto.FloorBuildingIdDTO; | ||||
| import com.iformall.domain.po.*; | import com.iformall.domain.po.*; | ||||
| import com.iformall.domain.po.base.TenantEntity; | import com.iformall.domain.po.base.TenantEntity; | ||||
| import com.iformall.domain.vo.WxMerchantBillVo; | |||||
| import com.iformall.enums.EnumBillAllType; | import com.iformall.enums.EnumBillAllType; | ||||
| import com.iformall.enums.EnumEnergyMeterPhysicsType; | import com.iformall.enums.EnumEnergyMeterPhysicsType; | ||||
| import com.iformall.enums.EnumEnergyMeterShopFloorType; | import com.iformall.enums.EnumEnergyMeterShopFloorType; | ||||
| @@ -231,8 +232,30 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| } | } | ||||
| @Override | @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 | @Override | ||||
| @@ -1011,38 +1034,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| @Override | @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<Long, String> buildingMap = wxMallBuildingService.getBuildingMap(record); | |||||
| // Map<Long, String> floorMap = wxMallFloorService.getFloorMap(record); | |||||
| // | |||||
| // List<Map<String,Object>> execlList = new ArrayList<Map<String,Object>>(); | |||||
| // WxEnergyMeterReading rq = new WxEnergyMeterReading(); | |||||
| // rq.updateTenantInfo(record); | |||||
| // //rq.setTimeId(tq.getId()); | |||||
| // PageInfo<WxEnergyMeterReading> 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<WxEnergyReadingCalcuteResult> page = readingCalcuteResultListAsPage(record, 1, 10000); | |||||
| excelService.exportExcel(page.getList(), null, "能源计算结果", WxEnergyReadingCalcuteResult.class, "能源计算结果.xlsx", response, false); | |||||
| } | } | ||||
| private File handlerImportFile(MultipartFile mFile,String fileNamePre) { | private File handlerImportFile(MultipartFile mFile,String fileNamePre) { | ||||