|
|
|
@ -242,7 +242,7 @@ |
|
|
|
SELECT |
|
|
|
SELECT |
|
|
|
wo.*, |
|
|
|
wo.*, |
|
|
|
-- 完工时间:仅当运行状态为15时取更新时间,否则为null |
|
|
|
-- 完工时间:仅当运行状态为15时取更新时间,否则为null |
|
|
|
CASE WHEN wo.RUN_STATUS = 15 THEN wo.update_time ELSE null END AS finishDate, |
|
|
|
CASE WHEN wo.RUN_STATUS = 2 THEN wo.update_time ELSE null END AS finishDate, |
|
|
|
yo.id AS yoId, |
|
|
|
yo.id AS yoId, |
|
|
|
ts.TS_NAME AS mainProcessingUnit, |
|
|
|
ts.TS_NAME AS mainProcessingUnit, |
|
|
|
yo.USE_DEPT AS needDeptName, |
|
|
|
yo.USE_DEPT AS needDeptName, |
|
|
|
@ -270,7 +270,7 @@ |
|
|
|
-- 班组 ts |
|
|
|
-- 班组 ts |
|
|
|
LEFT JOIN BS_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID |
|
|
|
LEFT JOIN BS_TEAM_SET ts ON wp.MAKE_TEAM = ts.ID |
|
|
|
WHERE |
|
|
|
WHERE |
|
|
|
wo.IS_DELETED = 0 |
|
|
|
wo.IS_DELETED = 0 and wo.RUN_STATUS = 2 |
|
|
|
<if test="q.wpId != null"> |
|
|
|
<if test="q.wpId != null"> |
|
|
|
AND t.WP_ID = #{q.wpId} |
|
|
|
AND t.WP_ID = #{q.wpId} |
|
|
|
</if> |
|
|
|
</if> |
|
|
|
|