From b64f24c2f24cde7aac5e5fc1f6253aeceda818ce Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Mon, 16 Dec 2024 13:08:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=8F=B8=E7=BB=9F=E8=AE=A1=E4=B8=8A?=
 =?UTF-8?q?=E6=9E=B6=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/bonus/common/biz/domain/BmCompanyInfo.java  |  2 ++
 .../bonus/material/device/mapper/DevInfoMapper.java |  2 ++
 .../device/service/impl/DevInfoServiceImpl.java     | 13 ++++++++++++-
 .../mapper/material/device/DevInfoMapper.xml        |  6 ++++++
 4 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java
index e3ca8bd..ed246ec 100644
--- a/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java
+++ b/bonus-common-biz/src/main/java/com/bonus/common/biz/domain/BmCompanyInfo.java
@@ -239,5 +239,7 @@ public class BmCompanyInfo implements Serializable {
     //用户名
     private String userName;
 
+    //上架数
+    private Integer maCount;
 
 }
\ No newline at end of file
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 28b7b51..693d8f6 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
@@ -142,6 +142,8 @@ public interface DevInfoMapper {
      */
     List<BmCompanyInfo> selectCompanyList(BmCompanyInfo obj);
 
+    List<BmCompanyInfo> getMaCountByCompany(BmCompanyInfo obj);
+
     int updateUpDown(@Param("maIds") List<Long> maIds, @Param("maStatus") Object maStatus);
 
     /**
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 63a193e..73ee4b9 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
@@ -625,7 +625,18 @@ public class DevInfoServiceImpl implements DevInfoService {
      */
     @Override
     public List<BmCompanyInfo> selectCompanyList(BmCompanyInfo obj) {
-        return devInfoMapper.selectCompanyList(obj);
+        List<BmCompanyInfo> companyInfos = devInfoMapper.selectCompanyList(obj);
+        List<BmCompanyInfo> companyMaCountList = devInfoMapper.getMaCountByCompany(obj);
+        if (!CollectionUtils.isEmpty(companyInfos) && !CollectionUtils.isEmpty(companyMaCountList)) {
+            for (BmCompanyInfo bmInfo : companyInfos) {
+                for (BmCompanyInfo maCountList : companyMaCountList) {
+                    if (bmInfo.getCompanyId().equals(maCountList.getCompanyId())) {
+                        bmInfo.setMaCount(maCountList.getMaCount());
+                    }
+                }
+            }
+        }
+        return companyInfos;
     }
 
     /**
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 95582e3..0a4bf94 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
@@ -585,6 +585,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </if>
     </select>
 
+    <select id="getMaCountByCompany" resultType="com.bonus.common.biz.domain.BmCompanyInfo">
+        select own_co as companyId,count(1) as maCount from ma_dev_info
+        where ma_status=2
+        group by own_co
+    </select>
+
     <select id="getBookCar" resultType="com.bonus.material.book.domain.BookCarInfoDto">
         SELECT
             ma_id as maId,