From 64a0130fe5a895910bf8c54d44777c3fbb7ca047 Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Thu, 4 Sep 2025 21:01:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../mapper/material/push/ProDataUseInfoMapper.xml | 12 ++++++++----
1 file changed, 8 insertions(+), 4 deletions(-)
diff --git a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
index a215fd48..6126105b 100644
--- a/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
+++ b/bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
@@ -463,13 +463,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.unit_name as unit,
mm.assets_code as assetsCode,
ifnull(mt.lease_price,0) as rentPrice,
- CASE mt.manage_type
+ CASE
+ mt.manage_type
WHEN 0 THEN
- IFNULL(count(mm.ma_id), 0)
+ IFNULL( COUNT( mm.ma_id ), 0 )
ELSE
- IFNULL(mt.storage_num, 0)
+ IFNULL( mt.storage_num, 0 )
END AS num,
- '在库' AS status
+ '在库' AS STATUS
FROM
ma_type mt
LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id
@@ -484,6 +485,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
AND mt.type_name like concat ('%', #{typeModelName}, '%')
+
+ and mt2.is_statics = #{isStatics}
+
AND (
mt.manage_type != 0
OR (