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 backReceiveRecord(BackApplyInfo record) { - List 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} and mm.ma_code like concat('%', #{maCode}, '%') - GROUP BY - bcd.type_id ORDER BY bcd.create_time DESC