From 544857b91547960c98b1fae20e676b1bb2de1fa7 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 31 五月 2023 15:22:13 +0800
Subject: [PATCH] 修改主数据分类未查询所有节点
---
Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java | 27 ++++++++++++++++++++++++---
Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/controller/DockingPreApplyCodeController.java | 10 +++++-----
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java | 2 +-
3 files changed, 30 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
index bf7280d..1ebd13f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-webservice-api/src/main/java/com/vci/ubcs/code/webservice/vo/DockingPreApplyFormVO.java
@@ -36,7 +36,10 @@
* 娑堟伅
*/
private String msg;
-
+ /***
+ * 鎿嶄綔绫诲瀷1锛氱敵璇� 2锛氭洿鏀�
+ */
+ private String operationType;
public String getCode() {
return code;
}
@@ -77,14 +80,32 @@
this.msg = msg;
}
+ public String getGroupCode() {
+ return groupCode;
+ }
+
+ public void setGroupCode(String groupCode) {
+ this.groupCode = groupCode;
+ }
+
+ public String getOperationType() {
+ return operationType;
+ }
+
+ public void setOperationType(String operationType) {
+ this.operationType = operationType;
+ }
+
@Override
public String toString() {
- return "DockingPreApplyCodeFormVO{" +
- "code='" + code + '\'' +
+ return "DockingPreApplyFormVO{" +
+ "groupCode='" + groupCode + '\'' +
+ ", code='" + code + '\'' +
", content='" + content + '\'' +
", dataOid='" + dataOid + '\'' +
", dataBtmName='" + dataBtmName + '\'' +
", msg='" + msg + '\'' +
+ ", operationType='" + operationType + '\'' +
'}';
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
index da5f0d1..02d1596 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/CodeClassifyClient.java
@@ -75,7 +75,7 @@
@Override
@PostMapping(CODE_CLASSIFY_TREE)
public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
- return plCodeClassifyService.referTree(treeQueryObject);
+ return plCodeClassifyService.treeCodeClassify(treeQueryObject);
}
@Override
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..b801e0f 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
@@ -130,7 +130,7 @@
* @return 闆嗗洟鍒嗙被鏄剧ず鏍�
*/
@GetMapping("/referTree")
- public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referTree(TreeQueryObject treeQueryObject) {
return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
}
@@ -140,7 +140,7 @@
* @return 涓婚搴撳垎绫绘樉绀烘爲
*/
@GetMapping("/referCodeClassifyTree")
- public List<Tree> referCodeClassifyTree(@RequestBody TreeQueryObject treeQueryObject) {
+ public List<Tree> referCodeClassifyTree(TreeQueryObject treeQueryObject) {
return codeClassifyClient.referCodeClassifyTree(treeQueryObject);
}
@@ -149,9 +149,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));
}
--
Gitblit v1.9.3