From 13716d87a6579ea8be6d76beb89f873d51d35a89 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 31 五月 2023 17:19:20 +0800
Subject: [PATCH] 将集团分类树查询待属性集合分开分别查询集团分类树，模型属性
---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
index 50c59af..08eebfe 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java
@@ -62,6 +62,12 @@
private final IDockingPreApplyFormService dockingPreApplyFormService;
+ /***
+ * 灞炴�ф灇涓捐寖鍥存湇鍔�
+ */
+
+ private final IDockingPreViewModelService dockingPreViewModelService;
+
/***
* 灞炴�ф灇涓捐寖鍥存湇鍔�
@@ -130,8 +136,19 @@
* @return 闆嗗洟鍒嗙被鏄剧ず鏍�
*/
@GetMapping("/referTree")
- public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
+ }
+
+
+ /**
+ * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
+ * @param classifyId 涓绘暟鎹垎绫讳富閿�
+ * @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
+ */
+ @GetMapping("/listViewModelAttributeByClassId")
+ public R listViewModelAttributeByClassId(String classifyId) {
+ return R.data(dockingPreViewModelService.selectDockingPreViewModelByClassId(classifyId,true));
}
/**
@@ -140,7 +157,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
@GetMapping("/referCodeClassifyTree")
- public List<Tree> referCodeClassifyTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
return codeClassifyClient.referCodeClassifyTree(treeQueryObject);
}
@@ -149,9 +166,9 @@
* @param codeClassifyId 涓绘暟鎹垎绫讳富閿�
* @return 涓婚搴撳垎绫绘ā鏉垮睘鎬�
*/
- @GetMapping("/referCodeClassifyTree")
- public List<CodeClassifyTemplateAttrVO> listCodeAttributeByClassId(String codeClassifyId) {
- return codeClassifyClient.listCodeAttributeByClassId(codeClassifyId);
+ @GetMapping("/listCodeAttributeByClassId")
+ public R listCodeAttributeByClassId(String codeClassifyId) {
+ return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
}
@@ -171,6 +188,7 @@
}
}
+
/***
* 鍚屾闆嗗洟妯″瀷瑙嗗浘
* @return 杩斿洖鎵ц缁撴灉淇℃伅
--
Gitblit v1.9.3