From 6bccfd2132c8523b5ebeffa772a8fa0e784d8165 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 01 八月 2023 10:17:50 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplySwingController.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 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 864a2a9..1ab780e 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
@@ -3,11 +3,16 @@
import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO;
import com.vci.ubcs.code.service.ICodeClassifyService;
import com.vci.ubcs.code.service.ICodeClassifyTemplateAttrService;
+import com.vci.ubcs.code.service.ICodeClassifyValueService;
import com.vci.ubcs.code.service.MdmEngineService;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateVO;
import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyValueVO;
import com.vci.ubcs.code.vo.pagemodel.CodeRuleVO;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
import com.vci.ubcs.starter.web.pagemodel.KeyValue;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
+import com.vci.ubcs.starter.web.pagemodel.UIFormReferVO;
import io.swagger.annotations.Api;
import lombok.AllArgsConstructor;
import org.springblade.core.tool.api.R;
@@ -40,6 +45,11 @@
* 妯℃澘灞炴�ф湇鍔�
*/
private final ICodeClassifyTemplateAttrService codeClstempattrService;
+
+ /***
+ * 鍒嗙被鐮佹鏈嶅姟
+ */
+ private final ICodeClassifyValueService codeClassifyValueService;
/**
* 鑾峰彇搴撹妭鐐逛俊鎭�
* @param libName 搴撹妭鐐瑰悕绉�
@@ -110,4 +120,37 @@
List<KeyValue> keyValueList=mdmEngineService.listComboboxItems(codeClstempattrService.getObjectByOid(oid));
return R.data(keyValueList);
}
+
+ /**
+ * 鍒嗙被鐮佹鐮佸�艰幏鍙�
+ * @param secOid
+ * @param parentClassifyValueOid
+ * @return
+ */
+ @GetMapping("/listCodeClassifyValueBySecOid")
+ public R<List<CodeClassifyValueVO>> listCodeClassifyValueBySecOid(String secOid,String parentClassifyValueOid){
+ List<CodeClassifyValueVO> codeClassifyValueVOS= codeClassifyValueService.listCodeClassifyValueBySecOid(secOid,parentClassifyValueOid);
+ return R.data(codeClassifyValueVOS);
+ }
+ /**
+ * 涓婚搴撳垎绫绘爲
+ * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄
+ * @return 涓婚搴撳垎绫绘樉绀烘爲
+ */
+ @GetMapping("/treeCodeClassify")
+ public R<List<Tree>> treeCodeClassify(TreeQueryObject treeQueryObject) {
+ List<Tree> treeList= codeClassifyService. treeCodeClassify(treeQueryObject);
+ return R.data(treeList);
+ }
+
+ /**
+ * 榛樿鐨勬爲褰㈠弬鐓у垪琛�
+ * @param referConfigVO 鍙傜収鐨勯厤缃俊鎭�
+ * @return 鎵ц鐨勭粨鏋�
+ */
+ @GetMapping("/defaultReferTree")
+ public R<List<Tree>> defaultReferTree(UIFormReferVO referConfigVO, TreeQueryObject queryObject){
+ List<Tree> defaultReferTree= mdmEngineService.referTree(referConfigVO,queryObject);
+ return R.data(defaultReferTree);
+ }
}
--
Gitblit v1.9.3