From d74e1672af99afd7e6a24327deb22b308dd5fc88 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期一, 04 十二月 2023 08:38:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java |   17 ++++++++++++++---
 1 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 7882b0c..ddf5d0c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -2,12 +2,15 @@
 
 
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingClassifyModelAttrVO;
+import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingReturnStoreVO;
 import org.springblade.core.tool.api.R;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
 
 
 /****
@@ -16,7 +19,7 @@
  * @date 2023-05-26
  */
 @FeignClient(
-	value = "ubcs-code"
+	value = "ubcs-applyjtcodeservice"
 )
 public interface IMdmInterJtClient {
 	String API_PREFIX = "/mdmInterService";
@@ -24,6 +27,7 @@
 	String RETURNGROUPCODE = API_PREFIX + "/getApplyGroupCode";
 	String PUBMDMMODEL = API_PREFIX + "/pubMdmModel";
 	String RECEIVE_EDITAPPLY =API_PREFIX + "/receiveEditApply";
+	String LIST_MAPPING=API_PREFIX + "/listMapping";
 
 	/***
 	 * 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑
@@ -32,8 +36,15 @@
 	 * @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
 	 */
 	@GetMapping(APPLYGROUPCODE)
-	public R applyGroupCode(String oids,String btmName);
+	public R applyGroupCode(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
 
+	/***
+	 *
+	 * @param codeClassifyOid
+	 * @return
+	 */
+	@GetMapping(LIST_MAPPING)
+	public R<List<DockingPreAttrMappingVO>> list_mapping(@RequestParam("codeClassifyOid")String codeClassifyOid);
 
 	/***
 	 * 闆嗗洟缂栫爜鏁版嵁淇敼
@@ -42,7 +53,7 @@
 	 * @return 杩斿洖瀛樺偍鏄惁鎴愬姛淇℃伅
 	 */
 	@PostMapping(RECEIVE_EDITAPPLY)
-	public R receiveEditApply(String oids,String btmName);
+	public R receiveEditApply(@RequestParam("oids")String oids,@RequestParam("btmName")String btmName);
 
 	/***
 	 * 灏嗛泦鍥㈢敵璇锋垚鍔熺殑缂栫爜瀛樺叆鐩稿叧鏁版嵁涔嬩腑

--
Gitblit v1.9.3