diff --git a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java index 88bd3a6d..32a60204 100644 --- a/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java +++ b/bd-business/bd-business-member/src/main/java/com/hzs/member/statis/controller/manager/CuBonusVertexStatisTotalController.java @@ -74,11 +74,21 @@ public class CuBonusVertexStatisTotalController extends BaseController { CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStaticTotalVO, CuBonusVertexStatisVO.class); for (CuBonusVertexStaticTotalVO ve : vertexList) { cvs.setPkVertex(ve.getPkVertex()); + + CuBonusVertexStaticTotalVO mapTouch = new CuBonusVertexStaticTotalVO(); + mapTouch.setPkVertex(ve.getPkVertex()); + //查询顶点拓展封顶人数 + CuBonusVertexStaticTotalVO orgTopNumber = iCuBonusVertexStatisService.queryOrgTopNumber(cvs); + if (orgTopNumber != null) { + mapTouch.setOrgTopNumber(orgTopNumber.getOrgTopNumber()); + } //查询顶点拓展平均碰次和拓展最高碰次 CuBonusVertexStaticTotalVO touch = iCuBonusVertexStatisService.queryTouch(cvs); if (touch != null) { - touchMap.put(ve.getPkVertex(), touch); + mapTouch.setOrgAvTouch(touch.getOrgAvTouch()); + mapTouch.setOrgMaxTouch(touch.getOrgMaxTouch()); } + touchMap.put(ve.getPkVertex(), mapTouch); } startPage(); @@ -144,11 +154,21 @@ public class CuBonusVertexStatisTotalController extends BaseController { CuBonusVertexStatisVO cvs = BeanUtil.copyProperties(cuBonusVertexStaticTotalVO, CuBonusVertexStatisVO.class); for (CuBonusVertexStaticTotalVO ve : vertexList) { cvs.setPkVertex(ve.getPkVertex()); + + CuBonusVertexStaticTotalVO mapTouch = new CuBonusVertexStaticTotalVO(); + mapTouch.setPkVertex(ve.getPkVertex()); + //查询顶点拓展封顶人数 + CuBonusVertexStaticTotalVO orgTopNumber = iCuBonusVertexStatisService.queryOrgTopNumber(cvs); + if (orgTopNumber != null) { + mapTouch.setOrgTopNumber(orgTopNumber.getOrgTopNumber()); + } //查询顶点拓展平均碰次和拓展最高碰次 CuBonusVertexStaticTotalVO touch = iCuBonusVertexStatisService.queryTouch(cvs); if (touch != null) { - touchMap.put(ve.getPkVertex(), touch); + mapTouch.setOrgAvTouch(touch.getOrgAvTouch()); + mapTouch.setOrgMaxTouch(touch.getOrgMaxTouch()); } + touchMap.put(ve.getPkVertex(), mapTouch); } //查询顶点奖金拨比汇总