diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index caea6c3d..6cdec932 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -1128,6 +1128,7 @@ b.node_name, c.reject_flag, CASE WHEN c.reject_flag = 'Y' THEN '是' ELSE '否' END AS rejectFlagDesc, + CASE WHEN c.process_intervention_flag = 'Y' THEN '是' ELSE '否' END AS process_intervention_flag, c.reject_node_id, dbo.plm_get_nodeName(a.site, c.reject_node_id, a.classification_no) AS rejectNodeName, c.node_conclusion, @@ -1140,11 +1141,7 @@ d.username AS create_by, c.reject_opinion, ISNULL(c.update_by, d.username) AS updateBy, - CAST(c.create_date AS DATETIME2(0)) AS create_date, - ROW_NUMBER() OVER ( - PARTITION BY b.node_id, d.username - ORDER BY c.create_date DESC -- ASC:保留最早;DESC:保留最新 - ) AS rn + CAST(c.create_date AS DATETIME2(0)) AS create_date FROM plm_request_header a LEFT JOIN plm_request_node b ON a.site = b.site @@ -1161,7 +1158,6 @@ WHERE a.site = #{site} AND a.menu_id = #{menuId} AND c.create_date IS NOT NULL - AND ISNULL(c.process_intervention_flag, ' ') ]]> 'Y' ) SELECT classification_no, @@ -1176,9 +1172,9 @@ update_date, create_by, reject_opinion, - updateBy + updateBy, + process_intervention_flag FROM cte - WHERE rn = 1 ORDER BY CASE WHEN create_date IS NULL THEN 1 ELSE 0 END, create_date