From bc263d8bed5d1405f275bb8638a9bec9eaf06585 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期一, 31 三月 2025 09:42:00 +0800
Subject: [PATCH] 添加审签逻辑，移动flow通用代码，添加根据角色查询用户，新增时间工具类，修改指派设备bug
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml
index 2dd41e9..b2322e1 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/mapper/xml/AssignFileStreamMapper.xml
@@ -24,6 +24,8 @@
, pt.parts_name as partsName
, ps.process_name as processName
, wt.step_name as stepName
+ , dem.device_management_name as deviceManagementName
+ , dem.device_management_code as deviceManagementCode
, dc.doc_name as docName
, dc.publish_version as version
, dc.doc_suffix as docSuffix
@@ -47,7 +49,10 @@
on a.doc_id=dc.doc_id
left join mdc_equipment de
on a.device_id=de.id
-
+ left join nc_device_type type
+ on a.device_type_id=type.id
+ left join nc_device_management dem
+ on type.device_management_id=dem.id
</select>
<select id="findByPage" resultType="org.jeecg.modules.dncFlow.ext.AssignFileStreamExt" parameterType="String">
--
Gitblit v1.9.3