From 44f5f0c5100d1a4d81e39f8717c5629ddc1d2e7e Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Tue, 7 Jan 2025 17:48:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8Fbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/material/device/mapper/DevInfoMapper.java    |  2 ++
 .../largeScreen/controller/LargeScreenController.java  |  6 ++++--
 .../bonus/material/largeScreen/entity/OrderData.java   |  3 +++
 .../resources/mapper/material/device/DevInfoMapper.xml | 10 ++++++++++
 4 files changed, 19 insertions(+), 2 deletions(-)

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'
     </select>
 
+    <select id="getMaTypeLeasingNum" resultType="java.lang.Integer">
+        SELECT
+            count(DISTINCT(type_id)) as count
+        FROM
+            ma_dev_info
+        WHERE
+            is_active = '1'
+          AND ma_status = '3'
+    </select>
+
     <select id="getRepairingDevNum" resultType="java.lang.Integer">
         select count(1)
         from lease_repair_record lrr