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 22e4053..656fcc8 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
@@ -202,6 +202,8 @@ public interface DevInfoMapper {
Integer getDevLeasingNum();
+ Integer getMaTypeLeasingNum();
+
Integer getRepairingDevNum();
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 8289498..03f8f69 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
@@ -103,9 +103,11 @@ public class LargeScreenController {
@ApiOperation("装备租赁统计")
@GetMapping("/devLeaseCount")
public AjaxResult devRentalCount() {
- OrderDto orderDto = orderMapper.getOrderCount();
OrderData orderData = new OrderData();
- orderData.setOrderNum(orderDto.getOrderNum());
+ //OrderDto orderDto = orderMapper.getOrderCount();
+ //orderData.setOrderNum(orderDto.getOrderNum());
+ Integer maTypeLeasingNum = devInfoMapper.getMaTypeLeasingNum();
+ orderData.setMaTypeLeasingNum(maTypeLeasingNum);
Integer devLeasingNum = devInfoMapper.getDevLeasingNum();
orderData.setDevLeasingNum(devLeasingNum);
Integer repairingDevNum = devInfoMapper.getRepairingDevNum();
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 35a9f60..e24ce7e 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
@@ -49,6 +49,9 @@ public class OrderData {
@ApiModelProperty(value = "装备总上架数")
private Integer devUpNum;
+ @ApiModelProperty(value = "类型总在租数")
+ private Integer maTypeLeasingNum;
+
@ApiModelProperty(value = "装备总在租数")
private Integer devLeasingNum;
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 fe84310..9e57d58 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
@@ -935,6 +935,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND ma_status = '3'
+
+