diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java index faa8996..2dfcd12 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/controller/LargeScreenController.java @@ -123,8 +123,10 @@ public class LargeScreenController { OrderData orderData = new OrderData(); Integer leaseNum = leaseInfoMapper.getLeaseCount(); Integer leaseOrderNum = leaseInfoMapper.getLeaseOrderCount(); + Integer maTypeCountFromLease = leaseInfoMapper.getMaTypeCountFromLease(); String topPopularTypeName = leaseInfoMapper.getTopPopularTypeName(); orderData.setLeaseNum(leaseNum); + orderData.setMaTypeCountFromLease(maTypeCountFromLease); orderData.setLeaseOrderRatio(MathUtil.calculatePercentage(leaseOrderNum, leaseNum)); orderData.setTopPopularTypeName(topPopularTypeName); return AjaxResult.success(orderData); diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java index e24ce7e..d2ca3da 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/largeScreen/entity/OrderData.java @@ -82,6 +82,9 @@ public class OrderData { @ApiModelProperty(value = "最需装备") private String topPopularTypeName; + @ApiModelProperty(value = "类型总需求数") + private Integer maTypeCountFromLease; + @ApiModelProperty(value = "装备统计列表") private List devInfos; } diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java index 6dd8c9b..2e22a5e 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/lease/mapper/MaLeaseInfoMapper.java @@ -120,6 +120,8 @@ public interface MaLeaseInfoMapper { Integer getLeaseOrderCount(); + Integer getMaTypeCountFromLease(); + String getTopPopularTypeName(); Integer getTodayLeaseOrderCount(); diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml index d38a3c4..6bc7a04 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/lease/MaLeaseInfoMapper.xml @@ -444,10 +444,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" lease_status in (1,3) + +