This commit is contained in:
parent
f4d9a8a171
commit
d6577e9a6e
|
|
@ -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
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue