代码提交

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 )
         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"
         <if test="typeModelName != null and typeModelName !=''">
             AND mt.type_name like concat ('%', #{typeModelName}, '%')
         </if>
+        <if test="isStatics != null">
+            and mt2.is_statics = #{isStatics}
+        </if>
         AND (
         mt.manage_type != 0
         OR (