| @@ -369,7 +369,7 @@ public class WxEnergyController extends BaseController { | |||||
| @GetMapping("feesShopComponentList") | @GetMapping("feesShopComponentList") | ||||
| public ResultData shopFeesList(@ModelAttribute WxEnergyFeesShop record) { | public ResultData shopFeesList(@ModelAttribute WxEnergyFeesShop record) { | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| return new ResultData(wxEnergyService.getFeesCalcuteComponentList(record)); | |||||
| return new ResultData(wxEnergyService.getFeesShopComponentList(record)); | |||||
| } | } | ||||
| @ApiOperation("计费标准新增修改") | @ApiOperation("计费标准新增修改") | ||||
| @@ -391,13 +391,13 @@ public class WxEnergyController extends BaseController { | |||||
| @GetMapping("feesShopDetail") | @GetMapping("feesShopDetail") | ||||
| public ResultData feesShopDetail(@ModelAttribute WxEnergyFeesShop record) { | public ResultData feesShopDetail(@ModelAttribute WxEnergyFeesShop record) { | ||||
| record.updateTenantInfo(getTenantInfo()); | record.updateTenantInfo(getTenantInfo()); | ||||
| return new ResultData(wxEnergyService.getShopFeesCalcute(record.getId(),record.getTenantId())); | |||||
| return new ResultData(wxEnergyService.getFeesShop(record.getId(),record.getTenantId())); | |||||
| } | } | ||||
| @ApiOperation("店铺修改计费标准") | @ApiOperation("店铺修改计费标准") | ||||
| @PostMapping("updateFeesShop") | @PostMapping("updateFeesShop") | ||||
| public ResultData updateFeesShop(@RequestBody WxEnergyFeesShop record) { | public ResultData updateFeesShop(@RequestBody WxEnergyFeesShop record) { | ||||
| wxEnergyService.saveOrUpdateShopFeesCalcute(record); | |||||
| wxEnergyService.updateFeesShop(record); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -49,6 +49,8 @@ public class WxEnergyFeesShop extends TenantEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") | @io.swagger.annotations.ApiModelProperty(value = "公摊计算公司", name = "formulaContent") | ||||
| private String formulaContent; | private String formulaContent; | ||||
| @TableField(exist = false) | |||||
| private List<String> formulaContentList; | |||||
| @TableField(exist = false) | @TableField(exist = false) | ||||
| private String treeType="feesShop"; | private String treeType="feesShop"; | ||||
| @@ -58,11 +58,11 @@ public interface WxEnergyService { | |||||
| List<Long> getFeesIdList(WxEnergyFees record); | List<Long> getFeesIdList(WxEnergyFees record); | ||||
| //计算标砖 | //计算标砖 | ||||
| List<Map<String,String>> getFeesCalcuteComponentList(WxEnergyFeesShop record); | |||||
| List<Map<String,String>> getFeesShopComponentList(WxEnergyFeesShop record); | |||||
| void createFeesShop(WxEnergyFeesShop record); | void createFeesShop(WxEnergyFeesShop record); | ||||
| void deleteFeesShop(WxEnergyFeesShop record); | void deleteFeesShop(WxEnergyFeesShop record); | ||||
| WxEnergyFeesShop getShopFeesCalcute(Long id,String tenantId); | |||||
| void saveOrUpdateShopFeesCalcute(WxEnergyFeesShop record); | |||||
| WxEnergyFeesShop getFeesShop(Long id,String tenantId); | |||||
| void updateFeesShop(WxEnergyFeesShop record); | |||||
| PageInfo<WxEnergyFeesShop> feesShopListAsPage(WxEnergyFeesShop record, Integer pageIndex, Integer pageSize); | PageInfo<WxEnergyFeesShop> feesShopListAsPage(WxEnergyFeesShop record, Integer pageIndex, Integer pageSize); | ||||
| //抄表数据 | //抄表数据 | ||||
| @@ -532,7 +532,7 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public List<Map<String,String>> getFeesCalcuteComponentList(WxEnergyFeesShop record) { | |||||
| public List<Map<String,String>> getFeesShopComponentList(WxEnergyFeesShop record) { | |||||
| List<Map<String,String>> retList = wxEnergyHelper.generateCalcuteComponent(record); | List<Map<String,String>> retList = wxEnergyHelper.generateCalcuteComponent(record); | ||||
| //公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 | //公共表,公摊总表,当前楼栋面积,当前楼层面积,总面积,店铺公摊系数 | ||||
| WxEnergyMeter mq = new WxEnergyMeter(); | WxEnergyMeter mq = new WxEnergyMeter(); | ||||
| @@ -568,7 +568,9 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| msf.setIsPublic(fees.getIsPublic()); | msf.setIsPublic(fees.getIsPublic()); | ||||
| msf.setFeesId(fees.getId()); | msf.setFeesId(fees.getId()); | ||||
| msf.setPrice(fees.getPrice()); | msf.setPrice(fees.getPrice()); | ||||
| msf.setFormulaContent(record.getFormulaContent()); | |||||
| if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { | |||||
| msf.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); | |||||
| } | |||||
| msf.setFormula(record.getFormula()); | msf.setFormula(record.getFormula()); | ||||
| wxEnergyHelper.testCalcute(record.getFormula()); | wxEnergyHelper.testCalcute(record.getFormula()); | ||||
| wxEnergyFeesShopMapper.insert(msf); | wxEnergyFeesShopMapper.insert(msf); | ||||
| @@ -581,25 +583,23 @@ public class WxEnergyServiceImpl implements WxEnergyService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public WxEnergyFeesShop getShopFeesCalcute(Long id,String tenantId) { | |||||
| return wxEnergyFeesShopMapper.selectById(id,tenantId); | |||||
| public WxEnergyFeesShop getFeesShop(Long id,String tenantId) { | |||||
| WxEnergyFeesShop fs = wxEnergyFeesShopMapper.selectById(id,tenantId); | |||||
| if (StringUtils.isNotBlank(fs.getFormulaContent())) { | |||||
| fs.setFormulaContentList(JSON.parseArray(fs.getFormulaContent(), String.class)); | |||||
| } | |||||
| return fs; | |||||
| } | } | ||||
| @Override | @Override | ||||
| public void saveOrUpdateShopFeesCalcute(WxEnergyFeesShop record) { | |||||
| public void updateFeesShop(WxEnergyFeesShop record) { | |||||
| Date date = new Date(); | Date date = new Date(); | ||||
| final IdWorker idWorker = IdWorker.get(); | |||||
| if (record.getId() == null) { | |||||
| record.setId(idWorker.nextId()); | |||||
| record.setCreateTime(date); | |||||
| record.setUpdateTime(date); | |||||
| wxEnergyHelper.testCalcute(record.getFormula()); | |||||
| wxEnergyFeesShopMapper.insert(record); | |||||
| }else { | |||||
| record.setUpdateTime(date); | |||||
| wxEnergyHelper.testCalcute(record.getFormula()); | |||||
| wxEnergyFeesShopMapper.updateById(record); | |||||
| } | |||||
| record.setUpdateTime(date); | |||||
| if (null != record.getFormulaContentList() && record.getFormulaContentList().size() > 0 ) { | |||||
| record.setFormulaContent(JSON.toJSONString(record.getFormulaContentList())); | |||||
| } | |||||
| wxEnergyHelper.testCalcute(record.getFormula()); | |||||
| wxEnergyFeesShopMapper.updateById(record); | |||||
| } | } | ||||
| @Override | @Override | ||||