bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

代码提交

This commit is contained in:
liang.chao 2025-09-04 20:57:07 +08:00
parent 81f82e3007
commit 13aa60f1c5
1 changed files with 41 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

76
bonus-modules/bonus-material/src/main/resources/mapper/material/push/ProDataUseInfoMapper.xml
View File

@ -579,41 +579,47 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
mt.type_id
) UNION ALL
(
SELECT
mt.type_id as typeId,
mt2.type_name as typeName,
mt.type_name as typeModelName,
mt.unit_name as unit,
mm.assets_code as assetsCode,
ifnull(mt.lease_price,0) as rentPrice,
CASE
mt.manage_type
WHEN 0 THEN
IFNULL( COUNT( mm.ma_id ), 0 ) ELSE IFNULL( mt.storage_num, 0 )
END AS num,
'在库' AS STATUS
FROM
ma_machine mm
LEFT JOIN ma_type mt ON mt.type_id = mm.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE
mm.ma_code IS NOT NULL
AND mm.ma_status IN ( 1 )
AND mt.LEVEL = 4
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
<if test="typeModelName != null and typeModelName !=''">
AND mt.type_name like concat ('%', #{typeModelName}, '%')
</if>
<if test="isStatics != null">
and mt2.is_statics = #{isStatics}
</if>
GROUP BY
mt.type_id
)
SELECT
mt.type_id as typeId,
mt2.type_name as typeName,
mt.type_name as typeModelName,
mt.unit_name as unit,
mm.assets_code as assetsCode,
ifnull(mt.lease_price,0) as rentPrice,
CASE
mt.manage_type
WHEN 0 THEN
IFNULL( COUNT( mm.ma_id ), 0 )
ELSE
IFNULL( mt.storage_num, 0 )
END AS num,
'在库' AS STATUS
FROM
ma_type mt
LEFT JOIN ma_machine mm ON mt.type_id = mm.type_id
LEFT JOIN ma_type mt2 ON mt2.type_id = mt.parent_id
LEFT JOIN ma_type mt3 ON mt3.type_id = mt2.parent_id
LEFT JOIN ma_type mt4 ON mt4.type_id = mt3.parent_id
WHERE
mt.LEVEL = 4
<if test="typeName != null and typeName !=''">
AND mt2.type_name like concat ('%', #{typeName}, '%')
</if>
<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 (
mt.manage_type = 0
AND mm.ma_code IS NOT NULL
AND mm.ma_status IN (1)
))
GROUP BY
mt.type_id)
</select>
<select id="getPersonNameAndPhone" resultType="com.bonus.system.api.domain.SysUser">
SELECT