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 | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 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 0634134..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
@@ -25,6 +25,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -86,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 涓婚搴撳垎绫绘樉绀烘爲
@@ -144,6 +156,7 @@
List<CodeClassifyValueVO> codeClassifyValueVOS= codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
return R.data(codeClassifyValueVOS);
}
+
/**
* 涓婚搴撳垎绫绘爲
* @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
@@ -151,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);
}
@@ -237,4 +250,19 @@
public R checkKeyAttrOnOrderFordatas(@RequestBody CodeOrderDTO orderDTO) throws Exception {
return R.data(mdmEngineService.checkKeyAttrOnOrderFordatas(orderDTO));
}
+
+ /**
+ * 闆嗗洟/浼佷笟鐮佹鍒ゆ柇
+ * @param classifyGroupCode 浼犲叆鏁版嵁 ,classifyGroupCode:閰嶇疆鐨勪腑鐨勫垎绫婚《鑺傜偣
+ * @param oid 浼犲叆鏁版嵁 ,閫夋嫨鑺傜偣鐨刼id--锛宯owApplyCode锛氬綋鍓嶇敵璇风紪鐮佺殑鍒嗙被
+ * @return 鎵ц缁撴灉
+ */
+ @GetMapping("/checkGroupCode")
+ @VciBusinessLog(operateName = "闆嗗洟/浼佷笟鐮佹鍒ゆ柇")
+ public R checkGroupCode(String oid,String classifyGroupCode) throws Exception {
+ Map<String,String> codtionMap=new HashMap<>();
+ codtionMap.put("oid",oid);
+ codtionMap.put("classifyGroupCode",classifyGroupCode);
+ return mdmEngineService.checkGroupCode(codtionMap);
+ }
}
--
Gitblit v1.9.3