From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期一, 05 六月 2023 16:16:35 +0800 Subject: [PATCH] 解决冲突 --- Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java | 24 ++++++++++++++++++++---- 1 files changed, 20 insertions(+), 4 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java index 67972cf..257c2c6 100644 --- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java +++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IGroupMdmInterService.java @@ -1,6 +1,7 @@ package com.vci.ubcs.code.webservice.service; +import com.vci.ubcs.starter.exception.VciBaseException; import org.springblade.core.tool.api.R; /*** @@ -13,7 +14,7 @@ * @param oids * @param btmName * @return 杩斿洖缁撴灉淇℃伅 - * @throws Exception + * @throws Throwable */ public R applyGroupCode(String oids, String btmName)throws Throwable; @@ -28,10 +29,25 @@ public R receiveEditApply(String oids, String btmName)throws Throwable; /*** - * - * @return + * 鏌ヨ鍒嗙被璇︾粏妯″瀷瑙嗗浘 + * @param jtclsfId锛氶泦鍥㈠垎绫籵id + * @return 杩斿洖缁撴灉淇℃伅 * @throws Throwable */ - public R pubJTclsfModel()throws Throwable; + public R queryClassModel(String jtclsfId)throws Throwable; + + /*** + * 鏌ヨ鍒嗙被璇︾粏妯″瀷瑙嗗浘 + * @return 杩斿洖缁撴灉淇℃伅 + * @throws Throwable + */ + public R queryMdmModel()throws Throwable; + /*** + *鍚屾闆嗗洟妯″瀷瑙嗗浘 + * @param classifyId + * @param operationType + * @return + */ + R syncClassifyModel(String classifyId, String operationType)throws VciBaseException; } -- Gitblit v1.9.3