diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java index addd2da..296d8db 100644 --- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java +++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/mapper/DevInfoMapper.java @@ -198,6 +198,8 @@ public interface DevInfoMapper { Integer getDevUpNum(); + List getDevUpCountByType(); + Integer getDevLeasingNum(); Integer getDevTypeNum(); 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 e7b9872..66c5161 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 @@ -16,6 +16,7 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; +import java.util.List; /** * @Author:liang.chao @@ -75,11 +76,13 @@ public class LargeScreenController { public AjaxResult devCount() { Integer devNum = devInfoMapper.getDevNum(); Integer devUpNum = devInfoMapper.getDevUpNum(); + List devInfos = devInfoMapper.getDevUpCountByType(); Integer devTypeNum = devInfoMapper.getDevTypeNum(); Integer devQcWarningNum = devInfoMapper.getDevQcWarningNum(); OrderData orderData = new OrderData(); orderData.setDevNum(devNum); orderData.setDevUpNum(devUpNum); + orderData.setDevInfos(devInfos); orderData.setDevTypeNum(devTypeNum); orderData.setDevQcWaningNum(devQcWarningNum); 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 3903ac0..07dfc63 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 @@ -1,8 +1,10 @@ package com.bonus.material.largeScreen.entity; +import com.bonus.material.device.domain.DevInfo; import io.swagger.annotations.ApiModelProperty; import lombok.Data; import java.math.BigDecimal; +import java.util.List; /** * @Author:liang.chao @@ -67,4 +69,7 @@ public class OrderData { @ApiModelProperty(value = "最需装备") private String topPopularTypeName; + + @ApiModelProperty(value = "装备统计列表") + private List devInfos; } diff --git a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml index e22c351..3b173bf 100644 --- a/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml +++ b/bonus-modules/bonus-material-mall/src/main/resources/mapper/material/device/DevInfoMapper.xml @@ -909,6 +909,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ma_status = '2' + +