From aa3e125e09c7f59c97d576eaa54c54a45d029123 Mon Sep 17 00:00:00 2001
From: mashuai <ma_shuai0327@163.com>
Date: Thu, 13 Jun 2024 13:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F=E9=A1=B5=E9=9D=A2=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/largeScreen/LargeScreenMapper.xml  | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
index 162dde6e..9051a06f 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/largeScreen/LargeScreenMapper.xml
@@ -439,14 +439,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         SELECT
         mt2.type_name AS typeName,
         mt2.type_id AS typeId,
-        mt.type_name AS typeModelName,
-        mt.unit_name AS unitName,
-        IFNULL( mt.num, 0 ) AS stockNum,
-        IFNULL( subquery1.usNum, 0 ) AS useNum,
-        IFNULL( subquery2.repairNum, 0 ) AS inRepairNum,
-        IFNULL( subquery3.repairInputNum, 0 ) AS inputNum,
-        IFNULL( subquery4.inputNum, 0 ) AS purchaseNum,
-        IFNULL( mt.num, 0 ) + IFNULL( subquery1.usNum, 0 ) + IFNULL( subquery2.repairNum, 0 ) + IFNULL( subquery3.repairInputNum, 0 ) AS totalOwnershipNum,
+        SUM(
+        IFNULL( mt.num, 0 )) AS stockNum,
+        SUM(
+        IFNULL( subquery1.usNum, 0 )) AS useNum,
+        SUM(
+        IFNULL( subquery2.repairNum, 0 )) AS inRepairNum,
+        SUM(
+        IFNULL( subquery3.repairInputNum, 0 )) AS inputNum,
+        SUM(
+        IFNULL( subquery4.inputNum, 0 )) AS purchaseNum,
+        SUM(
+        IFNULL( mt.num, 0 ) + IFNULL( subquery1.usNum, 0 ) + IFNULL( subquery2.repairNum, 0 ) + IFNULL( subquery3.repairInputNum, 0 )) AS totalOwnershipNum,
         sd.dept_name AS companyName
         FROM
         ma_type mt
@@ -549,6 +553,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="typeId!=null and typeId != ''">
             AND mt2.type_id = #{typeId}
         </if>
+        GROUP BY
+        mt2.type_id
     </select>
     <select id="getAcceptanceDetailStorage" resultType="com.bonus.sgzb.largeScreen.domain.StorageDetailVo">
         SELECT