From a19d26e88360c9760b2286bac4dfb1710fd2fa21 Mon Sep 17 00:00:00 2001 From: xiejun <xj@2023> Date: 星期六, 12 八月 2023 13:33:58 +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 | 20 +++++++++++++------- 1 files changed, 13 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..f19149d 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,12 @@ */ 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.core.dto.FlowTaskDTO; +import com.vci.ubcs.flow.core.entity.FlowTaskUser; 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 +32,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