1.资产已办任务返回当前进行中的节点

dao/src/main/resources/mapper/WorkTaskRecordMapper.xml

@@ -572,6 +572,7 @@
         (SELECT assets_name FROM assets_production WHERE assets_production.production_no = nodeInfo.business_min_id limit 1) AS
         reportName,
         nodeInfo.business_min_id AS reportNo,
+        nodeInfo.currentNodeName,
         instance.state AS instanceState,
         instance.id AS instanceId,
         instance.created AS startDate
@@ -588,11 +589,13 @@
         LEFT JOIN (SELECT id, order_id, name, department_id FROM assets WHERE deleted = 0) AS assets ON assets.id = log.business_id
         LEFT JOIN (SELECT nodeInstance.business_id AS businessId,
         nodeInstance.business_sub_id,
-        nodeInstance.business_min_id
-        FROM work_flow_node_instance AS nodeInstance
+        nodeInstance.business_min_id,
+        node.name AS currentNodeName
+        FROM work_flow_node_instance AS nodeInstance, work_node AS node
         WHERE state = 'PENDING'
+        AND node.id = nodeInstance.node_id
         AND nodeInstance.business_type = 'ASSET_BUSINESS'
-        AND deleted = 0
+        AND nodeInstance.deleted = 0
         ) AS nodeInfo ON nodeInfo.businessId = instance.business_id AND IF(instance.business_sub_id IS NOT NULL, nodeInfo.business_sub_id = instance.business_sub_id, TRUE) AND IF(instance.business_min_id IS NOT NULL, nodeInfo.business_min_id = instance.business_min_id, TRUE)
         LEFT JOIN user ON user.id = log.handler_id
         <if test="assetsSelectDTO != null and assetsSelectDTO.selectByDepartment">

domain/src/main/java/com/dayou/vo/AssetsTaskDoneVO.java

@@ -108,4 +108,9 @@ public class AssetsTaskDoneVO {
      */
     private String reportName;
 
+    /**
+     * 当前进行中节点名称
+     */
+    private String currentNodeName;
+
 }