From c9cc74fad46adaa4bc448cba673e830baf705fce Mon Sep 17 00:00:00 2001 From: cuilei <ray_tsu1@163.com> Date: 星期二, 24 六月 2025 17:40:45 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IAssignFileStreamService.java | 16 +++++----------- 1 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IAssignFileStreamService.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IAssignFileStreamService.java index 28cb20d..4d4d867 100644 --- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IAssignFileStreamService.java +++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/service/IAssignFileStreamService.java @@ -2,6 +2,7 @@ import com.baomidou.mybatisplus.extension.service.IService; import org.jeecg.common.api.vo.Result; +import org.jeecg.modules.dnc.entity.DocFile; import org.jeecg.modules.dnc.response.QueryPageResponseResult; import org.jeecg.modules.dncFlow.entity.AssignFileStream; import org.jeecg.modules.dncFlow.ext.AssignFileStreamExt; @@ -9,6 +10,7 @@ import org.jeecg.modules.dncFlow.request.AssignFileRequest; import org.jeecg.modules.dncFlow.request.AssignFileStreamQueryRequest; import org.jeecg.modules.dncFlow.vo.AssignFlowTaskVo; +import org.jeecg.modules.mdc.entity.MdcEquipment; public interface IAssignFileStreamService extends IService<AssignFileStream> { /** @@ -16,7 +18,7 @@ * @param stream * @return */ - Result applyAssignFile(AssignFileStream stream); + Result<?> applyAssignFile(AssignFileStream stream); /**securedoc * 鍚姩娴佺▼ 淇濆瓨鐩稿簲鐨勬暟鎹� 缁戝畾businessKey @@ -41,9 +43,7 @@ /** * 瀹℃壒鏈嶅姟 - * @param taskId - * @param streamId - * @param stream + * @param assignFlowTaskVo * @return */ boolean approveAssignFile(AssignFlowTaskVo assignFlowTaskVo); @@ -85,11 +85,5 @@ */ Boolean getFlowableEnable(); - /** - * 鎵爜浼犺緭绋嬪簭 涓嶇粡杩囧鎵� 鏂囦欢瀛樺湪閲囩敤瑕嗙洊 - * @param pnCode - * @param deviceNo - * @return - */ - boolean transferDocFile(String pnCode, String deviceNo); + void handleFileTransfer(MdcEquipment mdcEquipment, DocFile docFile); } -- Gitblit v1.9.3