From 9a8d9ef43c70fe6d70b494f49b19e5ca6ef01d4b Mon Sep 17 00:00:00 2001
From: zhangherong <571457620@qq.com>
Date: 星期五, 14 三月 2025 17:52:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 deletions(-)
diff --git a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamFlowController.java b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
similarity index 89%
rename from lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamFlowController.java
rename to lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
index d6dedb0..9ffe196 100644
--- a/lxzn-module-dnc/src/main/java/org/jeecg/modules/flow/controller/AssignFileStreamFlowController.java
+++ b/lxzn-module-dnc/src/main/java/org/jeecg/modules/dncFlow/controller/AssignFileStreamFlowController.java
@@ -1,9 +1,7 @@
-package org.jeecg.modules.flow.controller;
+package org.jeecg.modules.dncFlow.controller;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.extern.slf4j.Slf4j;
@@ -14,19 +12,17 @@
import org.flowable.image.ProcessDiagramGenerator;
import org.flowable.task.api.Task;
import org.jeecg.common.api.vo.Result;
-import org.jeecg.common.system.query.QueryGenerator;
import org.jeecg.common.system.vo.LoginUser;
-import org.jeecg.modules.flow.entity.HisWorkTask;
-import org.jeecg.modules.flow.entity.WorkTaskData;
-import org.jeecg.modules.flow.entity.WorkTaskDataVo;
-import org.jeecg.modules.flow.service.IAssignFileStreamService;
-import org.jeecg.modules.flow.service.IHisWorkTaskService;
-import org.jeecg.modules.flow.service.IWorkTaskService;
-import org.jeecg.modules.flow.service.IWorkTaskServiceVo;
-import org.jeecg.modules.flow.vo.FlowMy;
+import org.jeecg.modules.dncFlow.entity.HisWorkTask;
+import org.jeecg.modules.dncFlow.entity.WorkTaskData;
+import org.jeecg.modules.dncFlow.entity.WorkTaskDataVo;
+import org.jeecg.modules.dncFlow.service.IAssignFileStreamService;
+import org.jeecg.modules.dncFlow.service.IHisWorkTaskService;
+import org.jeecg.modules.dncFlow.service.IWorkTaskService;
+import org.jeecg.modules.dncFlow.service.IWorkTaskServiceVo;
+import org.jeecg.modules.dncFlow.vo.FlowMy;
import org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto;
-import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
-import org.jeecg.modules.flowable.apithird.business.service.IFlowMyBusinessService;
+import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
import org.jeecg.modules.flowable.service.IFlowTaskService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -48,7 +44,7 @@
@Slf4j
public class AssignFileStreamFlowController {
@Autowired
- IFlowMyBusinessService flowMyBusinessService;
+ FlowMyBusinessServiceImpl flowMyBusinessService;
@Autowired
IWorkTaskService workTaskService;
@Autowired
--
Gitblit v1.9.3