bonus
/
devicesmgt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev-nx' of http://192.168.0.56:3000/bonus/devicesmgt into dev-nx

This commit is contained in:
BianLzhaoMin 2024-06-07 14:44:20 +08:00
parent 18a57c30b5 d6577e9a6e
commit 70db7794fc
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sgzb-modules/sgzb-material/src/main/resources/mapper/material/PurchaseMacodeInfoMapper.xml
View File

@ -364,7 +364,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
pcd.task_id taskId, pcd.task_id taskId,
mt.CODE specsCode, mt.CODE specsCode,
mt1.CODE typeCode, mt1.CODE typeCode,
GROUP_CONCAT( mtk.user_id ) AS userIds,
CASE CASE
WHEN pmi.ma_code IS NULL THEN WHEN pmi.ma_code IS NULL THEN
CASE CASE
@ -385,7 +384,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN ma_machine mm ON pmi.ma_code = mm.ma_code LEFT JOIN ma_machine mm ON pmi.ma_code = mm.ma_code
LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id LEFT JOIN ma_type mt ON pcd.type_id = mt.type_id
LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id LEFT JOIN ma_type mt1 ON mt.parent_id = mt1.type_id
LEFT JOIN ma_type_keeper mtk ON mtk.type_id = pcd.type_id
WHERE WHERE
pcd.task_id = #{taskId} pcd.task_id = #{taskId}
AND pcd.`status` != 3 AND pcd.`status` != 3
@ -394,8 +392,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
and (mt.type_name like concat('%',#{dictName},'%') or and (mt.type_name like concat('%',#{dictName},'%') or
mt1.type_name like concat('%',#{dictName},'%')) mt1.type_name like concat('%',#{dictName},'%'))
</if> </if>
GROUP BY
pcd.type_id
ORDER BY ORDER BY
STATUS, STATUS,
pmi.id pmi.id