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/dnc/mapper/xml/DocInfoMapper.xml | 21 +++++++++------------
1 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
index 11283e2..6f4ebd9 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml
@@ -12,23 +12,22 @@
,r.attribution_type
,r.attribution_id
,u.doc_status
+ ,u.doc_dispatch_status
,u.publish_file_id
,u.publish_version
,u.description
,u.CREATE_TIME
- ,u.CREATE_USER
+ ,u.create_by
,u.UPDATE_TIME
- ,u.UPDATE_USER
+ ,u.update_by
,(case when o.doc_id is null then 1 else 2 end) as pullStatus
- ,s.realname as pullUser
+ ,o.create_by as pullUser
from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
inner join
(select * from nc_doc_info where delete_flag=0) u
on r.doc_id = u.doc_id
- left join (select doc_id, create_user from nc_file_operate where delete_flag=0) o
+ left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
on u.doc_id=o.doc_id
- left join sys_user s
- on o.create_user=s.id
${ew.customSqlSegment}
</select>
@@ -48,20 +47,18 @@
,u.publish_version
,u.description
,u.CREATE_TIME
- ,u.CREATE_USER
+ ,u.create_by
,u.UPDATE_TIME
- ,u.UPDATE_USER
+ ,u.update_by
,(case when o.doc_id is null then 1 else 2 end) as pullStatus
- ,s.realname as pullUser
+ ,o.create_by as pullUser
,(case when t.sync_flag is null then 2 else t.sync_flag end) as syncStatus
from (select classification_id, doc_id,attribution_type,attribution_id from nc_doc_relative where delete_flag=0) r
inner join
(select * from nc_doc_info where delete_flag=0) u
on r.doc_id = u.doc_id
- left join (select doc_id, create_user from nc_file_operate where delete_flag=0) o
+ left join (select doc_id, create_by from nc_file_operate where delete_flag=0) o
on u.doc_id=o.doc_id
- left join sys_user s
- on o.create_user=s.id
left join (select distinct file_id, doc_id, device_id, sync_flag from nc_to_equipment_lists where delete_flag = 0) t
on u.doc_id=t.doc_id and u.publish_file_id=t.file_id and r.attribution_id=t.device_id
${ew.customSqlSegment}
--
Gitblit v1.9.3