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/service/impl/DocFileServiceImpl.java |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

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..920cf7a 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
@@ -16,6 +16,7 @@
 import org.jeecg.modules.dnc.service.IDocFileService;
 import org.jeecg.modules.dnc.service.IDocInfoService;
 import org.jeecg.modules.dnc.service.IDocRelativeService;
+import org.jeecg.modules.mdc.entity.MdcEquipment;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
@@ -66,9 +67,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
@@ -80,7 +87,7 @@
         if(docFile == null) {
             ExceptionCast.cast(DocumentCode.DOC_FILE_ERROR);
         }
-        List<DeviceInfo> deviceList = docRelativeService.findDeviceByDocId(docFile.getDocId());
+        List<MdcEquipment> deviceList = docRelativeService.findDeviceByDocId(docFile.getDocId());
         if(deviceList != null && !deviceList.isEmpty())
             ExceptionCast.cast(DocumentCode.DOC_DEVICE_EXIST);
         DocInfo docInfo = new DocInfo();

--
Gitblit v1.9.3