From 016b3630bd5939563a2182cbf6bdc564ae210da8 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期五, 13 十月 2023 11:37:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
index 1e4f607..f5735ba 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java
@@ -87,6 +87,17 @@
 	}
 
 	/**
+	 * 浣跨敤妯℃澘鐨勪富閿幏鍙栬〃鍗曠殑瀹氫箟
+	 * @param codeClassifyOid 浣跨敤妯℃澘鐨勫垎绫讳富閿�
+	 * @return UI鐩稿叧鐨勪俊鎭紙浠呭寘鍚〃鍗曪級
+	 */
+	@GetMapping("/getFormDefineByTemplateOid")
+	public MdmUIInfoVO getFormDefineByTemplateOid(String codeClassifyOid){
+		CodeClassifyTemplateVO usedTemplateByClassifyOid = mdmEngineService.getUsedTemplateByClassifyOid(codeClassifyOid);
+		return mdmEngineService.getFormDefineByTemplateOid(usedTemplateByClassifyOid.getOid(),codeClassifyOid);
+	}
+
+	/**
 	 * 涓婚搴撳垎绫绘爲
 	 * @param parentId 鏍戝舰鏌ヨ瀵硅薄
 	 * @return 涓婚搴撳垎绫绘樉绀烘爲
@@ -145,6 +156,7 @@
 		List<CodeClassifyValueVO> codeClassifyValueVOS=	codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
 		return R.data(codeClassifyValueVOS);
 	}
+
 	/**
 	 * 涓婚搴撳垎绫绘爲
 	 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
@@ -152,7 +164,7 @@
 	 */
 	@GetMapping("/treeCodeClassify")
 	public R<List<Tree>> treeCodeClassify(TreeQueryObject treeQueryObject)  {
-		List<Tree>  treeList=	codeClassifyService. treeCodeClassify(treeQueryObject);
+		List<Tree> treeList = codeClassifyService.treeCodeClassify(treeQueryObject);
 		return R.data(treeList);
 	}
 

--
Gitblit v1.9.3