From 73f636092a4de604e5308a9a851f504d60a4c003 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期五, 17 一月 2025 11:17:08 +0800
Subject: [PATCH] 添加产品结构树创建人 更新人
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/DocInfoMapper.xml | 8 +---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java | 4 ++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java | 4 ++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java | 1
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java | 1
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml | 2 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java | 5 ++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml | 2 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml | 2 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocFileServiceImpl.java | 8 +++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java | 3 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java | 4 ++
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml | 2 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml | 2 +
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java | 19 +--------
lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java | 5 ++
16 files changed, 47 insertions(+), 25 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java
index 8a65316..e759688 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/controller/ComponentInfoController.java
@@ -4,7 +4,6 @@
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
import org.jeecg.common.aspect.annotation.AutoLog;
-import org.jeecg.common.system.base.controller.JeecgController;
import org.jeecg.modules.dnc.entity.ComponentInfo;
import org.jeecg.modules.dnc.entity.PermissionStream;
import org.jeecg.modules.dnc.response.CommonCode;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java
index ff3079b..f5615b1 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ComponentInfo.java
@@ -70,4 +70,9 @@
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+
+ //鍒涘缓浜�
+ private transient String createName;
+ //鏇存柊浜�
+ private transient String updateName;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java
index 7d2d7d0..84ead59 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocFile.java
@@ -46,4 +46,7 @@
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+
+ //褰撳墠鐗堟湰
+ private transient boolean publishFlag;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
index ac51391..280bfce 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/DocInfo.java
@@ -59,6 +59,7 @@
@Dict(dicCode = "dnc_pull_status")
private Integer pullStatus;
@TableField(exist = false)
+ @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname")
private String pullUser;
@TableField(exist = false)
private Integer attributionType;
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java
index 5ae3c9c..6c0c2d9 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/PartsInfo.java
@@ -65,4 +65,8 @@
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+ //鍒涘缓浜�
+ private transient String createName;
+ //鏇存柊浜�
+ private transient String updateName;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java
index fcb70fd..37ab638 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProcessStream.java
@@ -59,4 +59,8 @@
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+ //鍒涘缓浜�
+ private transient String createName;
+ //鏇存柊浜�
+ private transient String updateName;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java
index 57828ee..b067136 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/ProductInfo.java
@@ -43,4 +43,9 @@
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+
+ //鍒涘缓浜�
+ private transient String createName;
+ //鏇存柊浜�
+ private transient String updateName;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
index 7bbf9de..507f4ec 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/entity/WorkStep.java
@@ -79,4 +79,8 @@
@TableLogic
@TableField(value = "delete_flag", select = false)
private Integer deleteFlag = 0;
+ //鍒涘缓浜�
+ private transient String createName;
+ //鏇存柊浜�
+ private transient String updateName;
}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
index f39990c..e6285f0 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ComponentInfoMapper.xml
@@ -124,6 +124,8 @@
, comp.update_time
, comp.update_by
, comp.create_by
+ , (select sys_user.realname from sys_user where comp.create_by=sys_user.username) as createName
+ , (select sys_user.realname from sys_user where comp.update_by=sys_user.username) as updateName
from nc_component_info comp
inner join
(select distinct component_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
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 46cae6f..6184958 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
@@ -20,15 +20,13 @@
,u.UPDATE_TIME
,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_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_by=s.id
${ew.customSqlSegment}
</select>
@@ -52,7 +50,7 @@
,u.UPDATE_TIME
,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
@@ -60,8 +58,6 @@
on r.doc_id = u.doc_id
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_by=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}
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml
index 45c860a..0147846 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/PartsInfoMapper.xml
@@ -22,6 +22,8 @@
, p.create_by
, p.UPDATE_TIME
, p.update_by
+ , (select sys_user.realname from sys_user where p.create_by=sys_user.username) as createName
+ , (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
from nc_parts_info p
inner join
(select distinct parts_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
index 0c1045f..bb5aef0 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProcessStreamMapper.xml
@@ -20,6 +20,8 @@
, p.create_by
, p.UPDATE_TIME
, p.update_by
+ , (select sys_user.realname from sys_user where p.create_by=sys_user.username) as createName
+ , (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
from nc_process_stream p
inner join
(select distinct PROCESS_ID from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
index 0cb402f..f0dc586 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/ProductInfoMapper.xml
@@ -11,6 +11,8 @@
, p.UPDATE_TIME
, p.create_by
, p.update_by
+ , (select sys_user.realname from sys_user where p.create_by=sys_user.username) as createName
+ , (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
from nc_product_info p
inner join
(select distinct product_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
index 476ceec..db50589 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/mapper/xml/WorkStepMapper.xml
@@ -21,6 +21,8 @@
, p.device_no
, p.assemble_no
, p.assemble_name
+ , (select sys_user.realname from sys_user where p.create_by=sys_user.username) as createName
+ , (select sys_user.realname from sys_user where p.update_by=sys_user.username) as updateName
from nc_work_step p
inner join
(select distinct step_id from nc_permission_stream where delete_flag = 0 and user_id=#{userId}) s
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocFileServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocFileServiceImpl.java
index 0b248ab..3bbba55 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocFileServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocFileServiceImpl.java
@@ -66,9 +66,15 @@
@Override
public List<DocFile> findListByDocId(String docId) {
+ DocInfo docInfo = docInfoMapper.selectById(docId);
if(!ValidateUtil.validateString(docId))
return null;
- return super.lambdaQuery().eq(DocFile::getDocId, docId).orderByDesc(DocFile::getFileId).list();
+ List<DocFile> fileList=super.lambdaQuery().eq(DocFile::getDocId, docId).orderByDesc(DocFile::getFileId).list();
+ fileList.forEach(item->{
+ //瀵规瘮鐗堟湰
+ item.setPublishFlag(docInfo.getPublishVersion().equals(item.getDocVersion()));
+ });
+ return fileList;
}
@Override
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
index 7a0745f..f5b9fec 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dnc/service/impl/DocInfoServiceImpl.java
@@ -580,14 +580,7 @@
}
queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
- if(ValidateUtil.validateString(docQuery.getAscStr())) {
- String[] ascArr = docQuery.getAscStr().split(",");
-// ((Page<DocInfo>) pageData).setAsc(ascArr);
- }
- if(ValidateUtil.validateString(docQuery.getDescStr())) {
- String[] descStr = docQuery.getDescStr().split(",");
-// ((Page<DocInfo>) pageData).setDesc(descStr);
- }
+ queryWrapper.orderByDesc("u.create_time");
IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDocExtList(pageData, queryWrapper);
return Result.ok(docInfoIPage);
}
@@ -786,15 +779,7 @@
}
queryWrapper.ge(StrUtil.isNotEmpty(docQuery.getStartTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getStartTime());
queryWrapper.le(StrUtil.isNotEmpty(docQuery.getEndTime()),"date_format(u.create_time,'%Y-%m-%d %H:%i:%s')",docQuery.getEndTime());
-
- if(ValidateUtil.validateString(docQuery.getAscStr())) {
- String[] ascArr = docQuery.getAscStr().split(",");
-// ((Page<DocInfo>) pageData).setAsc(ascArr);
- }
- if(ValidateUtil.validateString(docQuery.getDescStr())) {
- String[] descStr = docQuery.getDescStr().split(",");
-// ((Page<DocInfo>) pageData).setDesc(descStr);
- }
+ queryWrapper.orderByDesc("u.create_time");
IPage<DocInfo> docInfoIPage = super.getBaseMapper().findDeviceDocExtList(pageData, queryWrapper);
if (docInfoIPage != null && docInfoIPage.getRecords() != null && !docInfoIPage.getRecords().isEmpty()) {
for (DocInfo d : docInfoIPage.getRecords()) {
--
Gitblit v1.9.3