From 7ef53ff9fe5229bf3d8ae4a42d9887ef96374be1 Mon Sep 17 00:00:00 2001
From: "liang.chao" <liang.chao@ustcinfo.com>
Date: Thu, 9 May 2024 13:29:20 +0800
Subject: [PATCH] =?UTF-8?q?app=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E6=97=A0=E6=95=B0=E6=8D=AEbug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java  | 2 --
 .../src/main/resources/mapper/app/BackReceiveMapper.xml      | 5 +----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
index 311a644d..c66a710d 100644
--- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
+++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/app/service/impl/BackReceiveServiceImpl.java
@@ -269,9 +269,7 @@ public class BackReceiveServiceImpl implements BackReceiveService {
 
     @Override
     public List<BackApplyInfo> backReceiveRecord(BackApplyInfo record) {
-
         List<BackApplyInfo> backApplyInfoList = backReceiveMapper.backReceiveRecord(record);
-
         return backApplyInfoList;
     }
 
diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
index 6e607072..60281b15 100644
--- a/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
+++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/app/BackReceiveMapper.xml
@@ -797,7 +797,7 @@
       SELECT
         mt2.type_name AS typeName,
         mt1.type_name AS typeCode,
-        ifnull(sum( bcd.back_num ), 0) AS backNum,
+        ifnull(bcd.back_num, 0) AS backNum,
         mm.ma_code as maCode,
         bcd.create_time AS backTime,
         bcd.type_id as modelId,
@@ -809,12 +809,9 @@
           LEFT JOIN ma_machine mm ON mm.ma_id = bcd.ma_id
       WHERE
         bcd.parent_id = #{parentId}
-        AND bcd.type_id = #{typeId}
       <if test="maCode != null and maCode != ''">
         and mm.ma_code like concat('%', #{maCode}, '%')
       </if>
-      GROUP BY
-        bcd.type_id
       ORDER BY
         bcd.create_time DESC
     </select>