From 05f6a6f9a03b6778cf1500f8c55eb9cf56378268 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Wed, 18 Dec 2024 15:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=BC=E5=90=88=E6=9F=A5=E8=AF=A2-=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/DevInfoServiceImpl.java       |  2 +-
 .../mapper/material/device/DevInfoMapper.xml   | 18 ++++++++----------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
index f206312..5ba4195 100644
--- a/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
+++ b/bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/device/service/impl/DevInfoServiceImpl.java
@@ -763,7 +763,7 @@ public class DevInfoServiceImpl implements DevInfoService {
     public List<DevInfoVo> getDevList(DevInfoVo devInfo) {
         List<DevInfoVo> devList = devInfoMapper.getDevList(devInfo);
         for (DevInfoVo devInfoVo : devList) {
-           DevInfo devInfo1 = devInfoMapper.getDevStatus(devInfoVo);
+            DevInfo devInfo1 = devInfoMapper.getDevStatus(devInfoVo);
             devInfoVo.setRentNum(devInfo1.getRentNum());
             devInfoVo.setMaStatus(devInfo1.getMaStatus());
         }
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 22a292a..df3c4ec 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
@@ -857,18 +857,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
     <select id="getDevStatus" resultType="com.bonus.material.device.domain.DevInfo">
         SELECT
-            COUNT(*) num as rentNum,
-            mdi.ma_status as maStatus
+            COUNT( moi.order_id ) AS rentNum,
+            mdi.ma_status
         FROM
-            ma_order_info moi
-                LEFT JOIN ma_order_details md ON moi.order_id = md.order_id
-                LEFT JOIN ma_dev_info mdi ON mdi.ma_id = md.ma_id
-                LEFT JOIN lease_repair_record lrr ON moi.order_id = lrr.order_id
-                AND md.ma_id = lrr.ma_id
-                LEFT JOIN sys_user su ON moi.buyer_id = su.user_id
-                LEFT JOIN sys_dept sd ON moi.buyer_company = sd.dept_id
+            ma_dev_info mdi
+                LEFT JOIN ma_order_details md ON mdi.ma_id = md.ma_id
+                LEFT JOIN ma_order_info moi ON moi.order_id = md.order_id
         WHERE
-            md.ma_id = #{maId}
+            mdi.ma_id = #{maId}
+        GROUP BY
+            mdi.ma_status
         ORDER BY
             moi.order_time DESC
     </select>