代码提交

This commit is contained in:
liang.chao 2025-09-04 21:01:32 +08:00
parent f8fc86dc2c
commit 64a0130fe5
1 changed files with 8 additions and 4 deletions

View File

@ -463,13 +463,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.unit_name as unit, mt.unit_name as unit,
mm.assets_code as assetsCode, mm.assets_code as assetsCode,
ifnull(mt.lease_price,0) as rentPrice, ifnull(mt.lease_price,0) as rentPrice,
CASE mt.manage_type CASE
mt.manage_type
WHEN 0 THEN WHEN 0 THEN
IFNULL(count(mm.ma_id), 0) IFNULL( COUNT( mm.ma_id ), 0 )
ELSE ELSE
IFNULL( mt.storage_num, 0 ) IFNULL( mt.storage_num, 0 )
END AS num, END AS num,
'在库' AS status '在库' AS STATUS
FROM FROM
ma_type mt ma_type mt
LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id 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 !=''"> <if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%') AND mt.type_name like concat ('%', #{typeModelName}, '%')
</if> </if>
<if test="isStatics != null">
and mt2.is_statics = #{isStatics}
</if>
AND ( AND (
mt.manage_type != 0 mt.manage_type != 0
OR ( OR (