From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/FlowTaskUserService.java |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/FlowTaskUserService.java b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/FlowTaskUserService.java
index a7ba9b4..0132fc3 100644
--- a/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/FlowTaskUserService.java
+++ b/Source/UBCS/ubcs-ops/ubcs-flow/src/main/java/com/vci/ubcs/flow/engine/service/FlowTaskUserService.java
@@ -16,15 +16,10 @@
  */
 package com.vci.ubcs.flow.engine.service;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
-import com.vci.ubcs.flow.core.entity.BladeFlow;
 import com.vci.ubcs.flow.engine.entity.*;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Map;
 
 /**
  * FlowService
@@ -35,20 +30,29 @@
 
 	/**
 	 * 鏌ヨ褰撳墠鐧婚檰浜哄杩欎釜娴佺▼鐨則askUser
+	 * @param type ProcessTemplateTypeEnum
 	 * @return
 	 */
-	FlowTaskUserC getUser();
+	Object getUser(String type,String templateId);
 
 	/**
 	 * 鏂板/淇敼娴佺▼鑺傜偣瀹℃牳浜洪厤缃�佸苟涓斾慨鏀规祦绋媥ml閮ㄧ讲鏂囦欢
 	 * @param flowTaskUserC
 	 * @return
 	 */
-	void saveOrUpdateUser(FlowTaskUserC flowTaskUserC);
+	void saveOrUpdateUser(FlowTaskDTO flowTaskUserC);
 
 	/**
 	 * 鍒犻櫎娴佺▼瀹℃牳浜哄憳
 	 * @param name
 	 */
 	void deleteUser(String name);
+
+	/**
+	 * 閫氳繃妯℃澘id鍜屾ā鍨媖ey鏌ヨ瀹℃壒浜�
+	 * @param templateId
+	 * @param modelKey
+	 * @return
+	 */
+	List<FlowTaskUser> getTaskUserByTemplateAndModelKey(String templateId,String modelKey);
 }

--
Gitblit v1.9.3