From 1becd6d46123723bd2b898fd565b4331fb2cb2d8 Mon Sep 17 00:00:00 2001
From: lyh <liuyuanheng@xalxzn.com>
Date: 星期五, 28 二月 2025 15:51:50 +0800
Subject: [PATCH] 新增flow able 代办已办

---
 lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/AssignFileStreamMapper.xml |   12 +++++++++---
 1 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/AssignFileStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/AssignFileStreamMapper.xml
index cdbc3cb..d30212b 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/AssignFileStreamMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/mapper/xml/AssignFileStreamMapper.xml
@@ -22,10 +22,12 @@
         , p.product_name as productName
         , c.component_name as componentName
         , pt.parts_name as partsName
+        , ps.process_name as processName
+        , wt.step_name as stepName
         , dc.doc_name as docName
         , dc.publish_version as version
         , dc.doc_suffix as docSuffix
-        , de.device_name as deviceName
+        , de.equipment_name as deviceName
         from (select * from nc_assign_file_stream where stream_id=#{streamId}) a
         left join sys_user u1
         on a.apply_user_id=u1.id
@@ -37,10 +39,14 @@
         on a.component_id=c.component_id
         left join nc_parts_info pt
         on a.parts_id=pt.parts_id
+        left join NC_PROCESS_STREAM ps
+        on a.process_id=ps.PROCESS_ID
+        left join nc_work_step wt
+        on a.step_id=wt.id
         left join nc_doc_info dc
         on a.doc_id=dc.doc_id
-        left join nc_device_info de
-        on a.device_id=de.device_id
+        left join mdc_equipment de
+        on a.device_id=de.id
 
     </select>
 

--
Gitblit v1.9.3