| @@ -100,8 +100,12 @@ public class WxBusinessController extends BaseController { | |||||
| businessDataVo.setRentRate(m.get("rent").toString()); | businessDataVo.setRentRate(m.get("rent").toString()); | ||||
| if(m.get("rentSaleRate") != null) | if(m.get("rentSaleRate") != null) | ||||
| businessDataVo.setRentSaleRate(m.get("rentSaleRate").toString()); | businessDataVo.setRentSaleRate(m.get("rentSaleRate").toString()); | ||||
| if(m.get("volume") != null) | |||||
| businessDataVo.setSale(m.get("volume").toString()); | |||||
| if(m.get("volume") != null) { | |||||
| //单位转万 | |||||
| BigDecimal b = (BigDecimal)m.get("volume"); | |||||
| String dstr = b.divide(new BigDecimal(1000)).setScale(2, BigDecimal.ROUND_HALF_UP).toString(); | |||||
| businessDataVo.setSale(dstr); | |||||
| } | |||||
| if(m.get("sale") != null) | if(m.get("sale") != null) | ||||
| businessDataVo.setSaleRate(m.get("sale").toString()); | businessDataVo.setSaleRate(m.get("sale").toString()); | ||||
| exeList.add(businessDataVo); | exeList.add(businessDataVo); | ||||
| @@ -115,7 +119,7 @@ public class WxBusinessController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { | |||||
| public ResultData devoteList(@ModelAttribute WxBusiness wxBusiness,Integer pageNum, Integer pageSize) { | |||||
| logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); | logger.debug("[" + getIpAddr() + "] WxBusinessController::devoteList"); | ||||
| wxBusiness.setTenantId(getTenantId()); | wxBusiness.setTenantId(getTenantId()); | ||||
| return new ResultData(wxBusinessService.devoteList(wxBusiness,pageNum,pageSize)); | return new ResultData(wxBusinessService.devoteList(wxBusiness,pageNum,pageSize)); | ||||