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 ffcf764..22e4053 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 getRepairingDevNum(); + Integer getDevTypeNum(); Integer getDevQcWarningNum(); 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 73bdb8e..8289498 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 @@ -108,6 +108,8 @@ public class LargeScreenController { orderData.setOrderNum(orderDto.getOrderNum()); Integer devLeasingNum = devInfoMapper.getDevLeasingNum(); orderData.setDevLeasingNum(devLeasingNum); + Integer repairingDevNum = devInfoMapper.getRepairingDevNum(); + orderData.setDevRepairingNum(repairingDevNum); DevInfo devInfo = devInfoMapper.getDevUsageRatio(); orderData.setDevUsageRatio(MathUtil.calculatePercentage(devInfo.getTotalLeaseDay(), devInfo.getTotalUpDay())); 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 3cc517d..35a9f60 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 @@ -52,6 +52,9 @@ public class OrderData { @ApiModelProperty(value = "装备总在租数") private Integer devLeasingNum; + @ApiModelProperty(value = "装备在修数量") + private Integer devRepairingNum; + @ApiModelProperty(value = "装备总类型数") private Integer devTypeNum; 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 6f2f957..fe84310 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,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" AND ma_status = '3' +