From e062cddb9b1bd6976bf5730274828bcef57e08e7 Mon Sep 17 00:00:00 2001
From: ludc <pUXmgxCf6A>
Date: 星期五, 26 五月 2023 10:27:19 +0800
Subject: [PATCH] 集团属性映射配置接口功能添加

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java              |   54 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java                    |   14 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java                       |   19 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java           |   28 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java                            |   50 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml                                        |   48 +
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java           |    5 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java      |   31 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java                        |   15 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java                       |    5 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java     |   36 +
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryClassifyVO.java      |   23 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java                       |   33 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryLibraryVO.java       |   39 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java                                   |    4 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java               |    7 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java            |  434 +++++++++++++
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java           |   29 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java           |   45 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml                                        |    2 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java            |   15 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java                        |   55 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml                                            |    2 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java               |   18 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java           |  141 ++++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java                       |   13 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java                        |   50 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java                               |   51 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java                          |   22 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml                                                        |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java                       |   26 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java         |   47 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java                                  |   31 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java            |   52 +
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java     |   21 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml                                     |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java               |   91 ++
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java |   48 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java                     |   24 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java                       |   50 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml                                               |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java               |   19 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java                |   17 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java                       |   11 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryData.java            |   45 +
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java                 |   73 ++
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java                      |   10 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml                                       |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java                              |   34 
 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml                                       |    6 
 50 files changed, 1,828 insertions(+), 75 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
index 049e5af..6364f4c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreApplyFormDTO.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.dto;
 
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import io.swagger.annotations.ApiModelProperty;
 
 /**
  * 璁板綍闆嗘垚灞炴暟鎹敵璇穒d
@@ -16,6 +17,11 @@
 	/***
 	 * 闆嗗洟缂栫爜
 	 */
+	private String groupCode;
+	/***
+	 * 閿欒鏍囪瘑鐮�
+	 */
+
 	private String code;
 
 	/***
@@ -34,6 +40,11 @@
 	 * 娑堟伅
 	 */
 	private String msg;
+
+	/**
+	 * 鐢宠鍗曠被鍨�1:鐢宠锛�2锛氭洿鏀�
+	 */
+	private  String operationType;
 
 	public String getCode() {
 		return code;
@@ -75,14 +86,32 @@
 		this.msg = msg;
 	}
 
+	public String getOperationType() {
+		return operationType;
+	}
+
+	public void setOperationType(String operationType) {
+		this.operationType = operationType;
+	}
+
+	public String getGroupCode() {
+		return groupCode;
+	}
+
+	public void setGroupCode(String groupCode) {
+		this.groupCode = groupCode;
+	}
+
 	@Override
 	public String toString() {
-		return "DockingPreApplyCodeFormVO{" +
-			"code='" + code + '\'' +
+		return "DockingPreApplyFormDTO{" +
+			"groupCode='" + groupCode + '\'' +
+			", code='" + code + '\'' +
 			", content='" + content + '\'' +
 			", dataOid='" + dataOid + '\'' +
 			", dataBtmName='" + dataBtmName + '\'' +
 			", msg='" + msg + '\'' +
+			", operationType='" + operationType + '\'' +
 			'}';
 	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
index 3a3403a..afe3d45 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreClassifyDTO.java
@@ -2,6 +2,8 @@
 
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
 
+import java.util.List;
+
 /***
  * 璁板綍闆嗗洟鍒嗙被淇℃伅
  * @author xiejun
@@ -29,6 +31,10 @@
 	 * 鐖剁骇鑺傜偣
 	 */
 	private  String pid;
+	/**
+	 * 闆嗗洟鍒嗙被鍖呭惈鐨勬ā鍨嬭鍥�
+	 */
+	List<DockingPreViewModelDTO> dockingPreViewModelDTOList;
 
 	public String getClassName() {
 		return className;
@@ -62,6 +68,14 @@
 		this.pid = pid;
 	}
 
+	public List<DockingPreViewModelDTO> getDockingPreViewModelDTOList() {
+		return dockingPreViewModelDTOList;
+	}
+
+	public void setDockingPreViewModelDTOList(List<DockingPreViewModelDTO> dockingPreViewModelDTOList) {
+		this.dockingPreViewModelDTOList = dockingPreViewModelDTOList;
+	}
+
 	@Override
 	public String toString() {
 		return "DockingPreClassifyDTO{" +
@@ -69,6 +83,7 @@
 			", nodeLink='" + nodeLink + '\'' +
 			", getNodeLinkName='" + getNodeLinkName + '\'' +
 			", pid='" + pid + '\'' +
+			", dockingPreViewModelDTOList=" + dockingPreViewModelDTOList +
 			'}';
 	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
index 779cee7..da14768 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/DockingPreViewModelDTO.java
@@ -1,6 +1,9 @@
 package com.vci.ubcs.code.dto;
 
 import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
+
+import java.util.List;
 
 /**
  * 璁板綍闆嗘垚闆嗗洟鍒嗙被瑙嗗浘淇℃伅
@@ -27,7 +30,10 @@
 	 * 鏁版嵁xinx
 	 */
 	private  String impactList;
-
+	/***
+	 * 妯″瀷瑙嗗浘鍖呭惈鐨勫睘鎬�
+	 */
+	private List<DockingPreMetaAttrDTO> dockingPreMetaAttrDTOList;
 
 	public String getViewName() {
 		return viewName;
@@ -53,12 +59,21 @@
 		this.impactList = impactList;
 	}
 
+	public List<DockingPreMetaAttrDTO> getDockingPreMetaAttrDTOList() {
+		return dockingPreMetaAttrDTOList;
+	}
+
+	public void setDockingPreMetaAttrDTOList(List<DockingPreMetaAttrDTO> dockingPreMetaAttrDTOList) {
+		this.dockingPreMetaAttrDTOList = dockingPreMetaAttrDTOList;
+	}
+
 	@Override
 	public String toString() {
-		return "DockingPreViewModelVO{" +
+		return "DockingPreViewModelDTO{" +
 			"viewName='" + viewName + '\'' +
 			", sourceClassifyId='" + sourceClassifyId + '\'' +
 			", impactList='" + impactList + '\'' +
+			", dockingPreMetaAttrDTOList=" + dockingPreMetaAttrDTOList +
 			'}';
 	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
index 324cc99..7b82cd1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/entity/DockingPreApplyForm.java
@@ -16,11 +16,15 @@
 @ApiModel(value = "DockingPreApplyForm", description = "闆嗗洟缂栫爜鐢宠鍗曡褰曞璞�")
 @EqualsAndHashCode
 public class DockingPreApplyForm extends BaseModel {
-
 	/***
 	 * 闆嗗洟缂栫爜
 	 */
 	@ApiModelProperty(value = "闆嗗洟缂栫爜")
+	private String groupCode;
+	/***
+	 * 閿欒鏍囪瘑鐮�
+	 */
+	@ApiModelProperty(value = "閿欒鏍囪瘑鐮�")
 	private String code;
 
 	/***
@@ -43,4 +47,9 @@
 	 */
 	@ApiModelProperty(value = "娑堟伅")
 	private String msg;
+	/**
+	 * 鐢宠鍗曠被鍨�1:鐢宠锛�2锛氭洿鏀�
+	 */
+	@ApiModelProperty(value = "娑堟伅")
+	private  String operationType;
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java
index 2832160..23d85ab 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreApplyFormVO.java
@@ -1,5 +1,8 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
+import io.swagger.annotations.ApiModelProperty;
+
+import javax.xml.soap.SAAJResult;
 
 /**
  * 璁板綍闆嗘垚灞炴暟鎹敵璇穒d
@@ -15,6 +18,10 @@
 	/***
 	 * 闆嗗洟缂栫爜
 	 */
+	private String  groupCode;
+	/***
+	 * 閿欒鏍囪瘑鐮�
+	 */
 	private String code;
 
 	/***
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java
index 8284527..4b9f618 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreClassifyVO.java
@@ -1,5 +1,7 @@
 package com.vci.ubcs.code.vo.pagemodel;
 
+import java.util.List;
+
 /**
  * 璁板綍闆嗘垚闆嗗洟鍒嗙被淇℃伅
  * @author xiejun
@@ -27,6 +29,10 @@
 	 * 鐖剁骇鑺傜偣
 	 */
 	private  String pid;
+	/***
+	 * 鍒嗙被妯″瀷瑙嗗浘
+	 */
+	private List<DockingPreViewModelVO> dockingPreViewModelVOList;
 
 	public String getClassName() {
 		return className;
@@ -60,13 +66,22 @@
 		this.pid = pid;
 	}
 
+	public List<DockingPreViewModelVO> getDockingPreViewModelVOList() {
+		return dockingPreViewModelVOList;
+	}
+
+	public void setDockingPreViewModelVOList(List<DockingPreViewModelVO> dockingPreViewModelVOList) {
+		this.dockingPreViewModelVOList = dockingPreViewModelVOList;
+	}
+
 	@Override
 	public String toString() {
-		return "DockingPreClassifyDTO{" +
+		return "DockingPreClassifyVO{" +
 			"className='" + className + '\'' +
 			", nodeLink='" + nodeLink + '\'' +
 			", getNodeLinkName='" + getNodeLinkName + '\'' +
 			", pid='" + pid + '\'' +
+			", dockingPreViewModelVOList=" + dockingPreViewModelVOList +
 			'}';
 	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
index 3421693..f4d047c 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/DockingPreViewModelVO.java
@@ -1,4 +1,7 @@
 package com.vci.ubcs.code.vo.pagemodel;
+
+import java.util.List;
+
 /**
  * 璁板綍闆嗘垚闆嗗洟鍒嗙被瑙嗗浘淇℃伅
  * @author xiejun
@@ -24,8 +27,10 @@
 	 * 鏁版嵁xinx
 	 */
 	private  String impactList;
-
-
+	/***
+	 * 妯″瀷瑙嗗浘鍖呭惈鐨勫睘鎬�
+	 */
+	private List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList;
 	public String getViewName() {
 		return viewName;
 	}
@@ -50,12 +55,21 @@
 		this.impactList = impactList;
 	}
 
+	public List<DockingPreMetaAttrVO> getDockingPreMetaAttrVOList() {
+		return dockingPreMetaAttrVOList;
+	}
+
+	public void setDockingPreMetaAttrVOList(List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList) {
+		this.dockingPreMetaAttrVOList = dockingPreMetaAttrVOList;
+	}
+
 	@Override
 	public String toString() {
 		return "DockingPreViewModelVO{" +
 			"viewName='" + viewName + '\'' +
 			", sourceClassifyId='" + sourceClassifyId + '\'' +
 			", impactList='" + impactList + '\'' +
+			", dockingPreMetaAttrVOList=" + dockingPreMetaAttrVOList +
 			'}';
 	}
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java
new file mode 100644
index 0000000..c388477
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ClassifyVO.java
@@ -0,0 +1,141 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+
+@XStreamAlias("classify")
+public class ClassifyVO {
+    /**
+     * 鍒嗙被id
+     */
+    @XStreamAsAttribute
+    private String id;
+    /***
+     * 鍒嗙被鍚嶇О
+     */
+    @XStreamAsAttribute
+    private String name;
+    /***
+     * 鐖惰妭鐐筰d
+     */
+    @XStreamAsAttribute
+    private String pid;
+    /***
+     * 鍒嗙被浠ｅ彿
+     */
+    @XStreamAsAttribute
+    private String classCode;
+    /***
+     * 鎻忚堪
+     */
+    @XStreamAsAttribute
+    private  String description;
+    /***
+     * 鍒嗙被閾炬帴璺緞
+     */
+    @XStreamAsAttribute
+    private  String fullPathName;
+    /***
+     * 鍒嗙被鐘舵��
+     */
+    @XStreamAsAttribute
+    private String lcStatus;
+	/***
+	 * 瑙勫垯id
+	 */
+	@XStreamAsAttribute
+	private String codeRuleId;
+
+	/***
+	 * 鏄惁涓哄彾瀛愯妭鐐�
+	 */
+	@XStreamAsAttribute
+	private boolean isLeaf;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getPid() {
+        return pid;
+    }
+
+    public void setPid(String pid) {
+        this.pid = pid;
+    }
+
+    public String getClassCode() {
+        return classCode;
+    }
+
+    public void setClassCode(String classCode) {
+        this.classCode = classCode;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getFullPathName() {
+        return fullPathName;
+    }
+
+    public void setFullPathName(String fullPathName) {
+        this.fullPathName = fullPathName;
+    }
+
+    public String getLcStatus() {
+        return lcStatus;
+    }
+
+    public void setLcStatus(String lcStatus) {
+        this.lcStatus = lcStatus;
+    }
+
+	public String getCodeRuleId() {
+		return codeRuleId;
+	}
+
+	public void setCodeRuleId(String codeRuleId) {
+		this.codeRuleId = codeRuleId;
+	}
+
+	public boolean isLeaf() {
+		return isLeaf;
+	}
+
+	public void setLeaf(boolean leaf) {
+		isLeaf = leaf;
+	}
+
+	@Override
+	public String toString() {
+		return "ClassifyVO{" +
+			"id='" + id + '\'' +
+			", name='" + name + '\'' +
+			", pid='" + pid + '\'' +
+			", classCode='" + classCode + '\'' +
+			", description='" + description + '\'' +
+			", fullPathName='" + fullPathName + '\'' +
+			", lcStatus='" + lcStatus + '\'' +
+			", codeRuleId='" + codeRuleId + '\'' +
+			", isLeaf=" + isLeaf +
+			'}';
+	}
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
new file mode 100644
index 0000000..8ab2193
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/CodeRuleVO.java
@@ -0,0 +1,5 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+public class CodeRuleVO {
+//	private String
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java
new file mode 100644
index 0000000..14b4b0f
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/LibraryVO.java
@@ -0,0 +1,52 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+import java.util.List;
+
+@XStreamAlias("library ")
+public class LibraryVO {
+    @XStreamAsAttribute
+    private String id;
+    @XStreamAsAttribute
+    private  String name;
+    @XStreamImplicit
+    private List<ClassifyVO>classify;
+
+	private List<CodeRuleVO> coderule;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<ClassifyVO> getClassify() {
+        return classify;
+    }
+
+    public void setClassify(List<ClassifyVO> classify) {
+        this.classify = classify;
+    }
+
+    @Override
+    public String toString() {
+        return "LibraryVO{" +
+                "id='" + id + '\'' +
+                ", name='" + name + '\'' +
+                ", classify=" + classify +
+                '}';
+    }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryClassifyVO.java
new file mode 100644
index 0000000..a5680d8
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryClassifyVO.java
@@ -0,0 +1,23 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+public class QueryClassifyVO {
+    /***
+     *
+     */
+    private QueryData data;
+
+    public QueryData getData() {
+        return data;
+    }
+
+    public void setData(QueryData data) {
+        this.data = data;
+    }
+
+    @Override
+    public String toString() {
+        return "QueryClassifyVO{" +
+                "data=" + data +
+                '}';
+    }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryData.java
new file mode 100644
index 0000000..a62ecb4
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryData.java
@@ -0,0 +1,45 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.vci.ubcs.code.vo.webserviceModel.apply.UserVO;
+
+@XStreamAlias("data")
+public class QueryData {
+    @XStreamAsAttribute
+    private String systemId;
+    private UserVO user;
+    private QueryLibraryVO library ;
+    public QueryLibraryVO getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(QueryLibraryVO library) {
+        this.library = library;
+    }
+
+    public String getSystemId() {
+        return systemId;
+    }
+
+    public void setSystemId(String systemId) {
+        this.systemId = systemId;
+    }
+
+	public UserVO getUser() {
+		return user;
+	}
+
+	public void setUser(UserVO user) {
+		this.user = user;
+	}
+
+	@Override
+    public String toString() {
+        return "QueryData{" +
+                "systemId='" + systemId + '\'' +
+                ", library=" + library +
+                '}';
+    }
+}
+
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryLibraryVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryLibraryVO.java
new file mode 100644
index 0000000..614b60c
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/QueryLibraryVO.java
@@ -0,0 +1,39 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+import com.thoughtworks.xstream.annotations.XStreamAsAttribute;
+import com.thoughtworks.xstream.annotations.XStreamImplicit;
+
+import java.util.List;
+
+@XStreamAlias("library")
+public class QueryLibraryVO {
+    @XStreamAsAttribute
+    private String id;
+    @XStreamImplicit
+    private List<String> classifyid;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public List<String> getClassifyid() {
+        return classifyid;
+    }
+
+    public void setClassifyid(List<String> classifyid) {
+        this.classifyid = classifyid;
+    }
+
+    @Override
+    public String toString() {
+        return "LibraryVO{" +
+                "id='" + id + '\'' +
+                ", classifyid=" + classifyid +
+                '}';
+    }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java
new file mode 100644
index 0000000..b514fa9
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultClassifyVO.java
@@ -0,0 +1,21 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+public class ResultClassifyVO {
+
+   private ResultData resultData;
+
+    public ResultData getResultData() {
+        return resultData;
+    }
+
+    public void setResultData(ResultData resultData) {
+        this.resultData = resultData;
+    }
+
+    @Override
+    public String toString() {
+        return "ResultClassifyVO{" +
+                "resultData=" + resultData +
+                '}';
+    }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java
new file mode 100644
index 0000000..2164004
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/coderule/ResultData.java
@@ -0,0 +1,45 @@
+package com.vci.ubcs.code.vo.webserviceModel.coderule;
+
+import com.thoughtworks.xstream.annotations.XStreamAlias;
+
+@XStreamAlias("data")
+public class ResultData {
+    @XStreamAlias("errorid")
+    private  String errorid;
+    @XStreamAlias("msg")
+    private String msg;
+    private LibraryVO library ;
+
+    public LibraryVO getLibrary() {
+        return library;
+    }
+
+    public void setLibrary(LibraryVO library) {
+        this.library = library;
+    }
+
+    public String getErrorid() {
+        return errorid;
+    }
+
+    public void setErrorid(String errorid) {
+        this.errorid = errorid;
+    }
+
+    public String getMsg() {
+        return msg;
+    }
+
+    public void setMsg(String msg) {
+        this.msg = msg;
+    }
+
+    @Override
+    public String toString() {
+        return "ResultData{" +
+                "code='" + errorid + '\'' +
+                ", msg='" + msg + '\'' +
+                ", library=" + library +
+                '}';
+    }
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java
new file mode 100644
index 0000000..7688858
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingGroupDataVO.java
@@ -0,0 +1,31 @@
+package com.vci.ubcs.code.vo.webserviceModel.group;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import java.util.List;
+
+/***
+ * 闆嗗洟鐢宠鎺ュ彛鍙傛暟淇℃伅
+ */
+@Data
+public class DockingGroupDataVO {
+
+	/***
+	 * 绯荤粺鏍囪瘑
+	 */
+
+	private String sysName;
+	/**
+	 * 涓氬姟鏁版嵁
+	 */
+	private List<DockingMainData> mainData;
+
+	@Override
+	public String toString() {
+		return "DockingGroupDataVO{" +
+			"sysName='" + sysName + '\'' +
+			", mainData=" + mainData +
+			'}';
+	}
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java
new file mode 100644
index 0000000..772edef
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingMainData.java
@@ -0,0 +1,47 @@
+package com.vci.ubcs.code.vo.webserviceModel.group;
+
+import io.swagger.annotations.ApiModel;
+import lombok.Data;
+
+import java.util.List;
+
+@Data
+public class DockingMainData {
+	/**
+ 	* 鐢宠鍗曞彿
+ 	*/
+	private String  applyId;
+	/***
+	 * 瀵嗙骇
+	 */
+	private  String secretLevel;
+
+	/***
+	 * 鐢宠鍗曚綅浠ｇ爜锛堝131460锛�
+	 */
+	private  String applyEntId;
+	/***
+	 * 鐢宠浜哄憳缂栫爜锛堢敤鎴峰悕锛屽85645824锛�
+	 */
+	private  String createBy;
+	/***
+	 * 鍒嗙被鍚嶇О
+	 */
+	private String  className;
+	/***
+	 * 妯″瀷瑙嗗浘淇℃伅
+	 */
+	private List<DockingViewVO> viewInfos;
+
+	@Override
+	public String toString() {
+		return "DockingMainData{" +
+			"applyId='" + applyId + '\'' +
+			", secretLevel='" + secretLevel + '\'' +
+			", applyEntId='" + applyEntId + '\'' +
+			", createBy='" + createBy + '\'' +
+			", className='" + className + '\'' +
+			", viewInfos=" + viewInfos +
+			'}';
+	}
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java
new file mode 100644
index 0000000..e1e3b95
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/DockingViewVO.java
@@ -0,0 +1,29 @@
+package com.vci.ubcs.code.vo.webserviceModel.group;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+/***
+ * 妯″瀷瑙嗗浘淇℃伅
+ */
+@Data
+public class DockingViewVO {
+	/**
+	 * 妯″瀷瑙嗗浘鍚嶇О
+	 */
+	private  String viewName;
+	/**
+	 * 灞炴�у璞′俊鎭�
+	 */
+	private List<Map<String,Object>> viewValue;
+
+	@Override
+	public String toString() {
+		return "DockingViewVO{" +
+			"viewName='" + viewName + '\'' +
+			", viewValue=" + viewValue +
+			'}';
+	}
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java
new file mode 100644
index 0000000..6e2f501
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/ResultDataVO.java
@@ -0,0 +1,15 @@
+package com.vci.ubcs.code.vo.webserviceModel.group;
+
+import lombok.Data;
+
+@Data
+public class ResultDataVO<T> {
+	/***
+	 * 娑堟伅
+	 */
+	private String code;
+
+	private String msg;
+
+	private T data;
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java
new file mode 100644
index 0000000..e2c9379
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataObjectVO.java
@@ -0,0 +1,36 @@
+package com.vci.ubcs.code.vo.webserviceModel.group.result;
+
+
+public class DataObjectVO {
+
+	private String msg;
+
+	private String code;
+
+	private DataVO data;
+
+	public String getMsg() {
+		return msg;
+	}
+
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public DataVO getData() {
+		return data;
+	}
+
+	public void setData(DataVO data) {
+		this.data = data;
+	}
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java
new file mode 100644
index 0000000..8c9ae96
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/DataVO.java
@@ -0,0 +1,28 @@
+package com.vci.ubcs.code.vo.webserviceModel.group.result;
+
+public class DataVO {
+
+	private String applyId;
+	private String customCoding;
+	private String formState;
+	public String getApplyId() {
+		return applyId;
+	}
+	public void setApplyId(String applyId) {
+		this.applyId = applyId;
+	}
+	public String getCustomCoding() {
+		return customCoding;
+	}
+	public void setCustomCoding(String customCoding) {
+		this.customCoding = customCoding;
+	}
+	public String getFormState() {
+		return formState;
+	}
+	public void setFormState(String formState) {
+		this.formState = formState;
+	}
+
+
+}
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java
new file mode 100644
index 0000000..2a7dcf7
--- /dev/null
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/webserviceModel/group/result/ResultDataObject.java
@@ -0,0 +1,48 @@
+package com.vci.ubcs.code.vo.webserviceModel.group.result;
+
+
+import java.util.List;
+
+public class ResultDataObject {
+	/**
+	 * 鐘舵�佺爜	1锛氭垚鍔燂紱2锛氬け璐�
+	 */
+	private String code;
+	/**
+	 * 鎺ュ彛璋冪敤缁撴灉	鎴愬姛锛涘け璐ュ師鍥�
+	 */
+	private String msg;
+	/***
+	 * 鏁版嵁瀵硅薄
+	 */
+	private List<DataObjectVO> data;
+	public String getCode() {
+		return code;
+	}
+	public void setCode(String code) {
+		this.code = code;
+	}
+	public String getMsg() {
+		return msg;
+	}
+	public void setMsg(String msg) {
+		this.msg = msg;
+	}
+
+	public List<DataObjectVO> getData() {
+		return data;
+	}
+
+	public void setData(List<DataObjectVO> data) {
+		this.data = data;
+	}
+
+	@Override
+	public String toString() {
+		return "ResultDataObject{" +
+			"code='" + code + '\'' +
+			", msg='" + msg + '\'' +
+			", data=" + data +
+			'}';
+	}
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
index fc4aee3..6fce916 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/constant/MdmBtmTypeConstant.java
@@ -5,6 +5,21 @@
  */
 public class MdmBtmTypeConstant {
 
+
+	/**
+	 * 鐘舵��
+	 */
+	public static final String CODE_STATUS_FILED = "lcstatus";
+
+	/**
+	 * 闆嗗洟鐮佺殑瀛楁
+	 */
+	public static final String CODE_GROUP_FIELD = "groupcode";
+
+	/**
+	 * 鍒嗙被鐨勪富閿瓧娈�
+	 */
+	public static final String CODE_CLASSIFY_OID_FIELD = "codeclsfid";
     /**
      * 涓婚搴撳垎绫�
      */
@@ -157,17 +172,30 @@
     public static final String DOCKING_PRE_JINTEGMAPCONFIG = "jintegmapconifg";
 
     /**
-     * 闆嗘垚灞炴�ф槧灏勫叧绯讳笟鍔＄被鍨�
+     * 闆嗘垚闆嗗洟鍒嗙被涓氬姟绫诲瀷
      */
     public static final String DOCKING_PRE_JCLASS = "jclass";
     /**
-     * 闆嗘垚灞炴�ф槧灏勫叧绯讳笟鍔＄被鍨�
+     * 闆嗘垚闆嗗洟妯″瀷灞炴�т笟鍔＄被鍨�
      */
     public static final String DOCKING_PRE_JMETAATRR = "jmetaattr";
 
     /**
-     * 闆嗘垚灞炴�ф槧灏勫叧绯讳笟鍔＄被鍨�
+     * 闆嗘垚灞炴�у彇鍊艰寖鍥村叧绯讳笟鍔＄被鍨�
      */
     public static final String DOCKING_PRE_JRANGE = "jrange";
 
+
+	/**
+	 * 闆嗘垚闆嗗洟鐢宠鍗曚笟鍔＄被鍨�
+	 */
+	public static final String DOCKING_PRE_JAPPLYFORM = "japplyform";
+
+
+
+	/**
+	 * 闆嗘垚闆嗗洟妯″瀷灞炴�т笟鍔＄被鍨�
+	 */
+	public static final String DOCKING_PRE_JVIEWMODEL = "jviewmodel";
+
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
index 6ddef1b..fbc0489 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingPreApplyCodeController.java
@@ -1,14 +1,27 @@
 package com.vci.ubcs.code.controller;
 
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.vci.ubcs.code.entity.DockingPreApplyForm;
+import com.vci.ubcs.code.feign.IMdmInterJtClient;
+import com.vci.ubcs.code.service.IDockingPreApplyFormService;
 import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
 import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
+import com.vci.ubcs.code.service.IDockingPreClassifyService;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.wrapper.DockingPreApplyFormWrapper;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
+import org.springblade.core.mp.support.Condition;
+import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 import org.springframework.web.bind.annotation.*;
 
@@ -24,7 +37,7 @@
  */
 @RestController
 @AllArgsConstructor
-@RequestMapping("ubcs-code/DockingPreApplyCode")
+@RequestMapping("/DockingPreApplyCode")
 @Api(value = "闆嗗洟灞炴�ф槧灏勯厤缃�", tags = "闆嗗洟灞炴�ф槧灏勯厤缃帴鍙�")
 public class DockingPreApplyCodeController {
 	/**
@@ -37,6 +50,20 @@
 
 	private final IDockingPreAttrRangeService dockingPreAttrRangeService;
 
+	/***
+	 * 鍒嗙被灞炴�ф灇涓捐寖鍥存湇鍔�
+	 */
+
+	private final IDockingPreClassifyService dockingPreClassifyService;
+
+	/***
+	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
+	 */
+
+	private final IDockingPreApplyFormService dockingPreApplyFormService;
+
+
+
 	/**
 	 * 鏍规嵁涓绘暟鎹紪鐮乷id鑾峰彇闆嗗洟灞炴�ф槧灏勪俊鎭�
 	 * @param codeClassifyId 涓婚敭
@@ -44,9 +71,9 @@
 	 */
 	@GetMapping("/gridAttrMapping")
 	@ApiOperationSupport(order = 8)
-	@ApiOperation(value = "鍒嗙被涓婚敭鑾峰彇涓庨泦鍥㈡ā鍨嬪睘鎬ф槧灏勫叧绯�", notes = "浼犲叆codeClassifyId")
-	public R getDockingAttrMappingsByCodeClassId(String codeClassifyId){
-		List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getdockingAttrMappingsByCodeclassId(codeClassifyId);
+	@ApiOperation(value = "鍒嗙被涓婚敭鑾峰彇涓庨泦鍥㈡ā鍨嬪睘鎬ф槧灏勫叧绯�", notes = "浼犲叆涓绘暟鎹�:codeClassifyId,闆嗗洟鍒嗙被:sourceClassifyId")
+	public R getDockingAttrMappingsByCodeClassId(String codeClassifyId,String sourceClassifyId){
+		List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=dockingPreAttrMappingService.getDockingAttrMappingsByCodeClassifyId(codeClassifyId,sourceClassifyId);
 		return R.data(dockingPreAttrMappingVOList);
 	}
 
@@ -64,11 +91,23 @@
 	}
 
 	/**
+	 * 鐢宠鍗曟煡璇� 鑷畾涔夊垎椤�
+	 */
+	@GetMapping("/page")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "鍒嗛〉", notes = "浼犲叆dockingPreApplyForm")
+	public R<IPage<DockingPreApplyFormVO>> page(DockingPreApplyForm dockingPreApplyForm, Query query) {
+		IPage<DockingPreApplyForm> pages = dockingPreApplyFormService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingPreApplyForm));
+		return R.data(DockingPreApplyFormWrapper.build().pageVO(pages));
+	}
+	/**
 	 * 淇濆瓨灞炴�ф槧灏勯厤缃粍浠�
 	 * @param dockingPreAttrMappingVOList 灞炴�ф槧灏勯厤缃暟鎹紶杈撳璞�
 	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
 	 */
 	@PostMapping( "/batchAddSave")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "淇濆瓨灞炴�ф槧灏勯厤缃�", notes = "dockingPreAttrMappingVOList")
 	public R batchSave(@Valid @RequestBody List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList){
 		List<DockingPreAttrMappingVO> dockingPreAttrRangeVOS=new ArrayList<>();
 		try {
@@ -79,4 +118,30 @@
 		return R.data(dockingPreAttrRangeVOS);
 	}
 
+
+	/**
+	 * 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
+	 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
+	 * @return 涓婚搴撳垎绫绘樉绀烘爲
+	 */
+	@GetMapping("/referTree")
+	public List<Tree> referTree(@RequestBody TreeQueryObject treeQueryObject)  {
+		return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
+	}
+
+	/***
+	 * 鐢宠闆嗗洟缂栫爜
+	 * @return
+	 */
+	@PostMapping( "/applyGroupCode")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
+	public R applyGroupCode(String oids,String btmName){
+		List<BaseModelVO> BaseModelVOs=new ArrayList<>();
+		try {
+			return dockingPreAttrMappingService.applyGroupCode(oids,btmName);
+		}catch (Throwable e){
+			return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
+		}
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java
new file mode 100644
index 0000000..de03dae
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/IMdmInterJtClient.java
@@ -0,0 +1,31 @@
+package com.vci.ubcs.code.feign;
+
+
+import com.vci.ubcs.code.vo.webserviceModel.group.DockingGroupDataVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.result.ResultDataObject;
+import org.springblade.core.tool.api.R;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import javax.validation.constraints.NotNull;
+
+/**
+ * 涓庨泦鍥㈢郴缁熼泦鎴愮殑璋冪敤鍣�
+ * @author xiejun
+ * @date 2023-5-24
+ */
+@FeignClient(name = "groupCOdeIntegration",
+	url = "${docking.apply.jtInterUrl:http://116.205.176.185:8099}",
+	path = "")
+public interface IMdmInterJtClient {
+
+	/**
+	 * mdm璋冪敤闆嗗洟mdm鐢宠闆嗗洟缂栫爜
+	 * @param dockingGroupDataVO AO/TO鐨勪俊鎭�
+	 * @return 鎵ц缁撴灉
+	 */
+	@PostMapping("/externalMainData/receiveAddApply")
+	ResultDataObject receiveAddApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO);
+
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java
new file mode 100644
index 0000000..be1e1fc
--- /dev/null
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmInterJtClient.java
@@ -0,0 +1,4 @@
+package com.vci.ubcs.code.feign;
+
+public class MdmInterJtClient {
+}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java
index 859ef22..351634f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/DockingPreClassifyMapper.java
@@ -1,7 +1,29 @@
 package com.vci.ubcs.code.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.vci.ubcs.code.entity.CodeClassify;
 import com.vci.ubcs.code.entity.DockingPreClassify;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 
 public interface DockingPreClassifyMapper extends BaseMapper<DockingPreClassify> {
+
+
+	/**
+	 * 鏌ユ壘鏍戝舰缁撴瀯
+	 *
+	 * @param oid 鍒嗙被鐨勪富閿�
+	 * @return 鏁版嵁闆嗗悎
+	 */
+	List<DockingPreClassify> selectCompanyGroupClassifyVOByTree(@Param("oid") String oid);
+
+
+	/**
+	 * 鏍￠獙鏄惁鍖呭惈瀛愯妭鐐�
+	 *
+	 * @param oid 鍒嗙被鐨勪富閿�
+	 * @return true 琛ㄧず鍖呭惈
+	 */
+	Boolean checkHasChild(@Param("oid") String oid);
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java
index fd7d7f4..34c66a3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreAttrMappingService.java
@@ -3,7 +3,10 @@
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.entity.DockingPreAttrMapping;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
+import org.springblade.core.tool.api.R;
+
 import java.util.List;
 
 /**
@@ -18,7 +21,7 @@
 	 * @param codeClassifyId
 	 * @return
 	 */
-	List<DockingPreAttrMappingVO> getdockingAttrMappingsByCodeclassId(String codeClassifyId);
+	List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId);
 
 	/**
 	 * 浣跨敤鏌ヨ灏佽鍣ㄦ潵鏌ヨ
@@ -33,4 +36,13 @@
 	 * @return 鎵ц缁撴灉锛宻uccess涓簍rue琛ㄧず鎴愬姛锛宮sg鏄け璐ョ殑鎻愮ず淇℃伅锛宱bj鏄坊鍔犲畬鎴愬悗鐨勬樉绀哄璞�
 	 */
 	public  List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingDTOS)throws Exception;
+
+	/***
+	 * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
+	 * @param oids
+	 * @param btmName
+	 * @return
+	 * @throws Exception
+	 */
+	public R applyGroupCode(String oids, String btmName)throws Throwable;
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java
index 271aab7..b48c619 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreClassifyService.java
@@ -2,6 +2,10 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.entity.DockingPreClassify;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
+
+import java.util.List;
 
 /***
  * 闆嗗洟鍒嗙被鏈嶅姟
@@ -9,4 +13,13 @@
  * @date 2022-05-23
  */
 public interface IDockingPreClassifyService extends IService<DockingPreClassify> {
+
+
+
+	/**
+	 * 鏌ヨ涓婚搴撳垎绫� 鏍�
+	 * @param treeQueryObject 鏍戞煡璇㈠璞�
+	 * @return 涓婚搴撳垎绫� 鏄剧ず鏍�
+	 */
+	List<Tree> treeCompanyGroupClassify(TreeQueryObject treeQueryObject);
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java
index dd623d1..a625756 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreMetaAttrService.java
@@ -3,6 +3,7 @@
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.entity.DockingPreMetaAttr;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
 
 import java.util.List;
 
@@ -22,4 +23,8 @@
 	 */
 
 	public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper);
+	/***
+	 * 鏍规嵁viewModel鏌ヨ妯″瀷瑙嗗浘灞炴��
+	 */
+	List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId);
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java
index ca94816..9f24bc3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingPreViewModelService.java
@@ -2,6 +2,9 @@
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.vci.ubcs.code.entity.DockingPreViewModel;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
+
+import java.util.List;
 
 /***
  * 闆嗗洟鍒嗙被妯″瀷鏈嶅姟
@@ -9,4 +12,11 @@
  * @date 2023-05-23
  */
 public interface IDockingPreViewModelService extends IService<DockingPreViewModel> {
+	/**
+	 * 鏍规嵁鍒嗙被id鏌ヨ鍒嗙被瑙嗗浘
+	 * @param classifyId 闆嗗洟鍒嗙被id
+	 * @param isContainAttr 鏄惁鏌ヨ灞炴�э紝true锛� 鏄紝false锛屽惁
+	 * @return 杩斿洖鍒嗙被妯″瀷瑙嗗浘闆嗗悎瀵硅薄
+	 */
+	List<DockingPreViewModelVO> selectDockingPreViewModelByClassId(String classifyId, boolean isContainAttr);
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java
index 2bff19f..66b5da9 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -1,28 +1,43 @@
 package com.vci.ubcs.code.service.impl;
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.entity.DockingPreMetaAttr;
+import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.vci.ubcs.code.constant.MdmBtmTypeConstant;
+import com.vci.ubcs.code.entity.*;
+import com.vci.ubcs.code.feign.IMdmInterJtClient;
 import com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper;
-import com.vci.ubcs.code.service.IDockingPreAttrMappingService;
-import com.vci.ubcs.code.service.IDockingPreAttrRangeService;
-import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.service.*;
+import com.vci.ubcs.code.vo.pagemodel.BaseModelVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.DockingGroupDataVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.DockingMainData;
+import com.vci.ubcs.code.vo.webserviceModel.group.DockingViewVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.ResultDataVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.result.DataObjectVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.result.DataVO;
+import com.vci.ubcs.code.vo.webserviceModel.group.result.ResultDataObject;
 import com.vci.ubcs.code.wrapper.DockingPreAttrMappingWrapper;
 import com.vci.ubcs.code.wrapper.DockingPreAttrRangeWrapper;
 import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.revision.model.BaseModel;
+import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
+import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /***
@@ -32,31 +47,70 @@
  */
 @Service
 public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService {
+
+
+
+	@Value("${docking.apply.unitCode:410-MDM}")
+	public String dockingApplyUnitCode;
+	@Autowired(required = false)
+	private  IMdmInterJtClient mdmInterJtClient;
+
 	/***
 	 * 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
 	 */
 	@Autowired(required = false)
-	DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+	private DockingPreAttrMappingMapper dockingPreAttrMappingMapper;
+
+	/***
+	 * 涓氬姟鏁版嵁灞炴�ф湇鍔�
+	 */
+	@Autowired(required = false)
+	private MdmEngineService mdmEngineService;
+
 	/***
 	 * 闆嗗洟灞炴�ф湇鍔�
 	 */
 	@Autowired(required = false)
-	IDockingPreMetaAttrService dockingPreMetaAttrService;
+	private IDockingPreMetaAttrService dockingPreMetaAttrService;
 	/***
 	 * 灞炴�у彇鍊艰寖鍥存湇鍔�
 	 */
 	@Autowired(required = false)
-	IDockingPreAttrRangeService dockingPreAttrRangeService;
+	private IDockingPreAttrRangeService dockingPreAttrRangeService;
+
+
+	/***
+	 * 闆嗗洟鍒嗙被鏈嶅姟
+	 */
+	@Autowired(required = false)
+	private IDockingPreClassifyService dockingPreClassifyService;
+
+	/***
+	 * 鐢宠鍗曟湇鍔�
+	 */
+	@Autowired(required = false)
+	private IDockingPreApplyFormService dockingPreApplyFormService;
+
+
+	/***
+	 * 妯″瀷瑙嗗浘鍗曟湇鍔�
+	 */
+	@Autowired(required = false)
+	private IDockingPreViewModelService dockingPreViewModelService;
+
+
 	/***
 	 * 鏍规嵁涓绘暟鎹垎绫讳富閿幏鍙栧垎绫讳俊鎭厤缃�
 	 * @param codeClassifyId
 	 * @return
 	 */
 	@Override
-	public List<DockingPreAttrMappingVO> getdockingAttrMappingsByCodeclassId(String codeClassifyId) {
+	public List<DockingPreAttrMappingVO> getDockingAttrMappingsByCodeClassifyId(String codeClassifyId,String sourceClassifyId) {
+		VciBaseUtil.alertNotNull(codeClassifyId,"涓绘暟鎹垎绫讳富閿�");
+		//VciBaseUtil.alertNotNull(sourceClassifyId,"闆嗗洟鍒嗙被涓婚敭");
 		//棣栧厛鑾峰彇鍒嗙被妯℃澘灞炴�э紝鐒跺悗涓庡睘鎬ч厤缃潗姣旇緝锛屼互闃茶鏈夊鍒犲睘鎬х殑鍙兘
-		List<DockingPreMetaAttr> dockingPreMetaAttrList=	dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,codeClassifyId));
-		List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, codeClassifyId));
+		List<DockingPreMetaAttr> dockingPreMetaAttrList=	dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId));
+		List<DockingPreAttrMapping> dockingPreAttrMappings=this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getSourceClassifyId, sourceClassifyId).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
 		Map<String/**灞炴�т富閿�**/, DockingPreAttrMapping> dockingPreAttrMappingMap = dockingPreAttrMappings.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getMetaListId(), t -> t));
 
 		List<DockingPreAttrMapping> newDockingPreAttrMappingList=new ArrayList<>();
@@ -66,6 +120,7 @@
 			if(dockingPreAttrMappingMap.containsKey(attrOid)){
 				dockingPreAttrMapping=	dockingPreAttrMappingMap.get(attrOid);
 			}else{
+				DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreAttrMapping, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
 				dockingPreAttrMapping.setMetaListId(dockingPreMetaAttr.getOid());//灞炴�т富閿�
 				dockingPreAttrMapping.setSourceAttrKey(dockingPreMetaAttr.getEnglishName());//鑻辨枃鍚嶇О
 				dockingPreAttrMapping.setSourceAttrName(dockingPreMetaAttr.getChineseName());//涓枃鍚嶇О
@@ -165,6 +220,120 @@
 		}
 		return dockingPreAttrMappingVOList;
 	}
+	private String code="";
+
+	private String msg="";
+
+	/***
+	 * 鍍忛泦鍥㈢敵璇烽泦鍥㈢爜
+	 * @param oids
+	 * @param btmName
+	 * @return
+	 * @throws Exception
+	 */
+	@Override
+	@Transactional
+	public R applyGroupCode(String oids, String btmName) throws VciBaseException {
+		List<BaseModel> updateCbos=new ArrayList<BaseModel>();
+		List<DockingPreApplyForm> dockingPreAttrMappings=new ArrayList<>();
+		VciBaseUtil.alertNotNull(oids,"閫夋嫨鐨勬暟鎹�");
+		VciBaseUtil.alertNotNull(btmName,"涓氬姟绫诲瀷");
+		//List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids));
+		List<BaseModelVO> dataModelList = new ArrayList<>();
+		if (!CollectionUtils.isEmpty(dataModelList)) {
+			DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO();
+			//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+			Map<String, DockingPreApplyForm> addDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
+			Map<String, DockingPreApplyForm> editDockingPreApplyFormMap = new HashMap<String, DockingPreApplyForm>();
+			Map<String, BaseModelVO> baseModelVOMap = new HashMap<String, BaseModelVO>();
+			//缁勭粐鏁版嵁
+			dockingGroupDataVO = queryApplycodeDataObjects(dataModelList, addDockingPreApplyFormMap, editDockingPreApplyFormMap, baseModelVOMap);
+			ResultDataObject resultDataObject = mdmInterJtClient.receiveAddApply(dockingGroupDataVO);
+			code = resultDataObject.getCode();
+			msg = resultDataObject.getMsg();
+			if ("1".equals(resultDataObject.getCode())) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+				List<DataObjectVO> dataObjectVOList = resultDataObject.getData();
+				dataObjectVOList.stream().forEach(dataObject -> {
+					boolean isEditDatas = false;
+					String code2 = dataObject.getCode();
+					DataVO data2 = dataObject.getData();
+					String applyId = data2.getApplyId();//鐢宠鍗昳d
+					String customCoding = StringUtils.isBlank(data2.getCustomCoding()) ? "" : data2.getCustomCoding();//闆嗗洟鐮佹
+					msg = dataObject.getMsg();
+					if (code2.equals("1")) {//缁撴灉姝ｇ‘鐨勬儏鍐�
+						if (!"".equals(customCoding)) {
+							isEditDatas = true;
+						}
+					}
+					//闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
+					if (editDockingPreApplyFormMap.containsKey(applyId)) {
+						DockingPreApplyForm dockingPreApplyForm = editDockingPreApplyFormMap.get(applyId);
+						dockingPreApplyForm.setCode(code2);
+						dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+						dockingPreApplyForm.setGroupCode(customCoding);
+						ObjectMapper mp = new ObjectMapper();
+						String writeValueAsString = null;
+						try {
+							writeValueAsString = mp.writeValueAsString(dataObject);
+							dockingPreApplyForm.setContent(writeValueAsString);
+						} catch (JsonProcessingException e) {
+						}
+					}
+					//鏂板鐨勭敵璇峰崟鏁版嵁
+					if (addDockingPreApplyFormMap.containsKey(applyId)) {
+						DockingPreApplyForm dockingPreApplyForm = addDockingPreApplyFormMap.get(applyId);
+						dockingPreApplyForm.setCode(code2);
+						dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+						dockingPreApplyForm.setGroupCode(customCoding);
+						ObjectMapper mp = new ObjectMapper();
+						String writeValueAsString = null;
+						try {
+							writeValueAsString = mp.writeValueAsString(dataObject);
+							dockingPreApplyForm.setContent(writeValueAsString);
+						} catch (JsonProcessingException e) {
+						}
+					}
+					//濡傛灉鏈夐泦鍥㈢爜鍒欐洿鏂版暟鎹�
+					if (isEditDatas) {
+						if (baseModelVOMap.containsKey(applyId)) {
+							BaseModelVO baseModelVO = baseModelVOMap.get(applyId);
+							BaseModel baseModel = new BaseModel();
+							BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
+							DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+							DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
+							baseModelVO.setId(customCoding);
+							updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
+						}
+					}
+				});
+			} else {
+				editDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
+					dockingPreApplyForm.setCode("2");
+					dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+					dockingPreApplyForm.setContent("");
+					dockingPreApplyForm.setGroupCode("");
+					DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
+				});
+				addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
+					dockingPreApplyForm.setCode("2");
+					dockingPreApplyForm.setMsg("鐢宠锛�" + msg);
+					dockingPreApplyForm.setContent("");
+					dockingPreApplyForm.setGroupCode("");
+					DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
+				});
+			}
+			if (editDockingPreApplyFormMap.size() > 0) {
+				dockingPreAttrMappings.addAll(editDockingPreApplyFormMap.values());//娣诲姞鐢宠鍗曟暟鎹�
+			}
+			if (addDockingPreApplyFormMap.size() > 0) {
+				dockingPreAttrMappings.addAll(addDockingPreApplyFormMap.values());//闇�瑕佷慨鏀圭殑鐢宠鍗曟暟鎹�
+			}
+			//淇濆瓨琛ㄥ崟鏁版嵁
+			dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
+			//mdmEngineService.saveBatch(updateCbos);//淇濆瓨鏁版嵁
+		}
+		return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
+	}
 
 	/***
 	 * 瀵硅薄杞崲
@@ -184,4 +353,237 @@
 			}
 			return dockingPreAttrMappingVOList;
 		}
+
+
+	/**
+	 * 缁勭粐鏁版嵁
+	 * */
+	private DockingGroupDataVO queryApplycodeDataObjects(List<BaseModelVO> codeWupins,Map<String,DockingPreApplyForm>   addDockingPreApplyFormMap,Map<String,DockingPreApplyForm>  editDockingPreApplyFormMap,Map<String,BaseModelVO>  codeWupinMap) throws VciBaseException{
+		try {
+			String curUserName = AuthUtil.getUser().getUserName();
+			//鐢宠鐨勬暟鎹�
+			List<DockingMainData> mainDataList=new ArrayList<DockingMainData>();
+			for (BaseModelVO dataBusinessObject : codeWupins) {
+				String format = new SimpleDateFormat("yyyyMMddHHmmssSSS").format(new Date());
+				String codeclsfid = dataBusinessObject.getData().getOrDefault("codeclsfid","");
+				String btmName = dataBusinessObject.getBtmname();
+				String oid = dataBusinessObject.getOid();
+
+				DockingPreApplyForm dockingPreApplyForm = new DockingPreApplyForm();
+
+				String dataOid = dataBusinessObject.getOid();
+				Map<String, String> conditionsMap = new HashMap<String, String>();
+				List<DockingPreApplyForm> applyFormObjects = dockingPreApplyFormService.list(Wrappers.<DockingPreApplyForm>query().lambda().eq(DockingPreApplyForm::getDataOid, dataOid).eq(DockingPreApplyForm::getOperationType, "1"));
+				String apllyCode = "";
+				if (!CollectionUtils.isEmpty(applyFormObjects)) {
+					dockingPreApplyForm = applyFormObjects.get(0);
+					apllyCode = dockingPreApplyForm.getId();
+					editDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+				} else {
+					apllyCode = dockingApplyUnitCode + "-" + format;
+					dockingPreApplyForm.setId(apllyCode);
+					dockingPreApplyForm.setName("");
+					dockingPreApplyForm.setOperationType("2");
+					dockingPreApplyForm.setDescription(dataBusinessObject.getDescription());//鑾峰彇鏁版嵁鎻忚堪淇℃伅
+					dockingPreApplyForm.setDataOid(oid);
+					dockingPreApplyForm.setDataBtmName(btmName);
+					addDockingPreApplyFormMap.put(apllyCode, dockingPreApplyForm);//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
+				}
+
+				codeWupinMap.put(apllyCode, dataBusinessObject);//鐢宠鍗曞拰瀵瑰簲鏁版嵁鍏崇郴
+				conditionsMap = new HashMap<String, String>();
+				conditionsMap.put("jtargetclsfid", codeclsfid);//瑙嗗浘oid
+
+				List<DockingPreAttrMapping> dockingPreAttrMappingList = this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId, codeclsfid));
+				if (CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
+					throw new Exception("鏍规嵁鎵�閫夌殑鏁版嵁锛屾病鏈夋壘鍒板搴旂殑闆嗗洟鍒嗙被璁剧疆锛岃鏍稿!");
+				}
+				String jsourceclsfid = dockingPreAttrMappingList.get(0).getSourceClassifyId();
+				//鑾峰彇鏁版嵁妯″瀷鍒嗙被淇℃伅
+				DockingPreClassify dockingPreClassify = dockingPreClassifyService.getById(jsourceclsfid);
+				DockingMainData mainData = new DockingMainData();
+				mainData.setApplyEntId(dockingApplyUnitCode);//鐢宠鍗曚綅浠ｇ爜
+				mainData.setApplyId(apllyCode);//鐢宠鍗曞彿
+				mainData.setClassName(dockingPreClassify.getGetNodeLinkName());//鍒嗙被鍚嶇О
+				mainData.setCreateBy(curUserName);//
+				mainData.setSecretLevel("鍐呴儴");//瀵嗙骇锛岄粯璁や负鍐呴儴
+				mainData.setViewInfos(getviewInfos(dockingPreClassify, dataBusinessObject));//鑾峰彇瑙嗗浘妯″瀷
+				mainDataList.add(mainData);
+			}
+			//鏍规嵁鏁版嵁妯″瀷锛岀粍缁囨墍闇�瑕佹暟鎹�
+			DockingGroupDataVO postParameters=new DockingGroupDataVO();
+			postParameters.setSysName("420-CODE");//绯荤粺鏍囪瘑
+			postParameters.setMainData(mainDataList);//
+			return postParameters;
+		} catch (Throwable e) {
+			// TODO Auto-generated catch block
+			throw new VciBaseException("鏌ヨ鏁版嵁鍑洪敊"+e);
+		}
+	}
+
+	/**
+	 * 鑾峰彇妯″瀷瑙嗗浘
+	 * @param dockingPreClassify
+	 * @param dataBusinessObject
+	 * @throws VciBaseException
+	 */
+	private List<DockingViewVO>getviewInfos(DockingPreClassify dockingPreClassify,BaseModelVO dataBusinessObject) throws Throwable{
+		List<DockingViewVO> viewInfoList=new ArrayList<>();
+		String jclassOid=	dockingPreClassify.getOid();
+		Map<String,String>conditionsMap=new HashMap<String, String>();
+		conditionsMap.put("jsourceclsfid",jclassOid);
+		conditionsMap.put("jviewname","缂栫爜瑙嗗浘");//鐢宠鍙紶缂栫爜瑙嗗浘
+		//鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
+		List<DockingPreViewModel> dockingPreViewModels= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassOid).eq(DockingPreViewModel::getViewName,"缂栫爜瑙嗗浘"));
+		for (DockingPreViewModel dockingPreViewModel : dockingPreViewModels) {
+			//缁勭粐鏁版嵁灞炴�т俊鎭�
+			DockingViewVO viewInfo=new DockingViewVO();
+			viewInfo.setViewName(dockingPreViewModel.getViewName());//瑙嗗浘鍚嶇О
+			viewInfo.setViewValue(getViewValueList(dockingPreViewModel,jclassOid,dataBusinessObject));//瑙嗗浘
+			viewInfoList.add(viewInfo);
+		}
+		return viewInfoList;
+	}
+
+	/***
+	 * 鑾峰彇閰嶇疆淇℃伅
+	 * @param dockingPreViewModel
+	 * @param jclassOid
+	 * @param dataBusinessObject
+	 * @return
+	 * @throws VciBaseException
+	 */
+	private List<Map<String, Object>> getViewValueList(DockingPreViewModel dockingPreViewModel,String jclassOid,BaseModelVO dataBusinessObject) throws Throwable{
+		//鏋勯�犳ā鍨嬭鍥炬暟鎹�
+		List<Map<String, Object>> viewValueList=new ArrayList<Map<String,Object>>();
+		String oid = dockingPreViewModel.getOid();
+		Map<String,String> dataValueMap=dataBusinessObject.getData();
+		String codeClassifyId=dataValueMap.get("codeclsfid");
+		Map<String,String>conditionsMap=new HashMap<String, String>();
+
+
+
+		List<DockingPreAttrMapping> dockingPreAttrMappingList = this.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda()
+			.eq(DockingPreAttrMapping::getSourceClassifyId, jclassOid).eq(DockingPreAttrMapping::getTargetClassifyId, codeClassifyId));
+		if(CollectionUtils.isEmpty(dockingPreAttrMappingList)) {
+			return viewValueList;
+		}
+
+		Map<String,DockingPreAttrMapping> jintegmappconfigMap=new HashMap<String, DockingPreAttrMapping>();
+		for (DockingPreAttrMapping businessObject : dockingPreAttrMappingList) {
+			jintegmappconfigMap.put(businessObject.getSourceAttrKey(), businessObject);
+		}
+		List<DockingPreMetaAttr> dockingPreMetaAttrList= dockingPreMetaAttrService.selectByWrapper(
+			Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,dockingPreViewModel.getOid())
+				.eq(DockingPreMetaAttr::getSourceClassifyId,dockingPreViewModel.getSourceClassifyId()));
+
+		Map<String,Object> viewValueMap=new HashMap<String,Object>();
+		for (DockingPreMetaAttr dockingPreMetaAttr : dockingPreMetaAttrList) {
+			String jenglishname=dockingPreMetaAttr.getEnglishName();////闆嗗洟閰嶇疆灞炴��
+			if(jintegmappconfigMap.containsKey(jenglishname)){
+				DockingPreAttrMapping dockingPreAttrMapping=jintegmappconfigMap.get(jenglishname);
+				String attrId = dockingPreAttrMapping.getTargetAttrId();//缂栫爜灞炴�d
+				String jtargetattrkey = dockingPreAttrMapping.getTargetAttrKey();//缂栫爜灞炴�d
+				Object newVaue=null;
+				if(StringUtils.isNotBlank(jtargetattrkey)){
+					getAttrRange(dockingPreMetaAttr);//鑾峰彇瀛楁鍙栧�艰寖鍥�
+					String value=dataValueMap.get(jtargetattrkey)==null?"":dataValueMap.getOrDefault(jtargetattrkey,"");
+					newVaue = getVaue(dockingPreMetaAttr, value);
+				}else{
+					newVaue = getVaue(dockingPreMetaAttr, "");
+				}
+				if(newVaue==null||"".equals(newVaue)){
+					newVaue= dockingPreMetaAttr.getDefaultValue();
+				}
+				viewValueMap.put(jenglishname, newVaue);
+			}
+		}
+
+		viewValueList.add(viewValueMap);
+		return viewValueList;
+	}
+
+	/***
+	 * 鑾峰彇灞炴�ф灇涓炬槧灏勯厤缃�
+	 */
+	Map<String,Map<String,DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();
+	private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{
+
+		String jmetalistoid = jmetaatter.getOid();
+		if(attrRangeMap.containsKey(jmetalistoid)) {
+			return;
+		}
+		Map<String,String>conditionsMap=new HashMap<String, String>();
+		conditionsMap.put("jmetalistid", jmetalistoid);//瑙嗗浘oid
+		List<DockingPreAttrRange> dockingPreAttrRangeList = dockingPreAttrRangeService.selectByWrapper(Wrappers.<DockingPreAttrRange>query().lambda().eq(DockingPreAttrRange::getMetaListId, jmetalistoid));
+		if (CollectionUtils.isEmpty(dockingPreAttrRangeList)) {
+			return;
+		}
+		Map<String, DockingPreAttrRange> rangeMap = new HashMap<String, DockingPreAttrRange>();
+		rangeMap = dockingPreAttrRangeList.stream().collect(Collectors.toMap(s -> s.getNumTextValue(), t -> t, (o1, o2) -> o2));
+		attrRangeMap.put(jmetalistoid, rangeMap);
+
+	}
+	/****
+	 * 鍊肩被鍨嬭浆鎹�
+	 * @param jmetaatter
+	 * @param value
+	 * @return
+	 * @throws Throwable
+	 */
+	private Object getVaue(DockingPreMetaAttr jmetaatter,String value) throws Throwable{
+		//jmetadatatype	鍏冩暟鎹被鍨嬶紙1 瀛楃鍨�, 2 鏁村瀷, 3 闀挎暣鍨�, 4 鍗曠簿搴�, 5 鍙岀簿搴�,6 鏃ユ湡鍨�, 7 鏃堕棿鍨�, 8 甯冨皵鍨�, 9 鏂囦欢, 10澶嶅悎鍨嬶級
+		int jmetadatatype = jmetaatter.getMetaDataType();
+		String jmetalistoid = jmetaatter.getOid();
+		Map<String, DockingPreAttrRange> rangeMap=new HashMap<String, DockingPreAttrRange>();
+		if(attrRangeMap.containsKey(jmetalistoid)){
+			rangeMap = attrRangeMap.get(jmetalistoid);
+			if(rangeMap.containsKey(value)){
+				DockingPreAttrRange dockingPreAttrRange = rangeMap.get(value);
+				value=dockingPreAttrRange.getNumText();//灏嗙紪鐮佸睘鎬у煙鍊艰浆鎹㈡垚闆嗗洟瀵瑰簲鐨勫煙鍊�
+			}
+		}
+
+		if(jmetadatatype==1){//1 瀛楃鍨�
+			return StringUtils.isBlank(value)?"":value;
+		}else if(jmetadatatype==2){//2 鏁村瀷
+			return StringUtils.isBlank(value)?null:Integer.parseInt(value);
+		}else if(jmetadatatype==3){//3 闀挎暣鍨�
+			return StringUtils.isBlank(value)?null:Long.parseLong(value);
+		}else if(jmetadatatype==4){//4 鍗曠簿搴�,
+			return StringUtils.isBlank(value)?null:Float.parseFloat(value);
+		}else if(jmetadatatype==5){// 5 鍙岀簿搴�
+			return StringUtils.isBlank(value)?null:Double.parseDouble(value);
+		}else if(jmetadatatype==6){//6 鏃ユ湡鍨�
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-mm-dd");
+			if(StringUtils.isBlank(value)) {
+				return null;
+			}else {
+				try {
+					return simpleDateFormat.parse(value);
+				} catch (ParseException e) {
+					throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
+				}
+			}
+		}else if(jmetadatatype==7){//7 鏃堕棿鍨�
+			SimpleDateFormat simpleDateFormat = new SimpleDateFormat("HH:mm:ss");
+			if(StringUtils.isBlank(value)) {
+				return null;
+			}else{
+				try {
+					return simpleDateFormat.parse(value);
+				} catch (ParseException e) {
+					throw new VciBaseException("date", new String[]{"鏃ユ湡鏍煎紡杞崲閿欒"});
+				}
+			}
+		}else	if(jmetadatatype==8){//8 甯冨皵鍨�
+			return value;
+		}else if(jmetadatatype==9){//9 鏂囦欢,
+			return value;
+		}else if(jmetadatatype==10){//10澶嶅悎鍨�
+			return value;//绗﹀悎鍨嬫槸浠�涔堜笢涓滃浣曞鐞�
+		}
+		return value;
+	}
+
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
index 849557e..c2ca759 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreClassifyServiceImpl.java
@@ -1,17 +1,26 @@
 package com.vci.ubcs.code.service.impl;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
 import com.vci.ubcs.code.entity.DockingPreClassify;
+import com.vci.ubcs.code.enumpack.FrameworkDataLCStatus;
 import com.vci.ubcs.code.mapper.DockingPreClassifyMapper;
 import com.vci.ubcs.code.service.IDockingPreClassifyService;
+import com.vci.ubcs.code.service.IDockingPreViewModelService;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
+import com.vci.ubcs.code.wrapper.DockingPreClassifyWrapper;
+import com.vci.ubcs.starter.revision.model.TreeQueryObject;
+import com.vci.ubcs.starter.revision.model.TreeWrapperOptions;
+import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
+import com.vci.ubcs.starter.web.pagemodel.Tree;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.util.Collection;
-import java.util.Map;
-import java.util.function.Function;
+import javax.annotation.Resource;
+import java.util.*;
+
+import static com.vci.ubcs.code.constant.MdmBtmTypeConstant.CODE_CLASSIFY_OID_FIELD;
+import static com.vci.ubcs.code.service.impl.CodeClassifyServiceImpl.PARENT_FIELD_NAME;
 
 /**
  * 闆嗗洟鍒嗙被涓氬姟鏈嶅姟
@@ -19,7 +28,77 @@
  * @date 2023-05-23
  */
 @Service
+@Slf4j
 public class DockingPreClassifyServiceImpl extends ServiceImpl<DockingPreClassifyMapper, DockingPreClassify> implements IDockingPreClassifyService {
+	/***
+	 * 闆嗗洟鍒嗙被灞炴��
+	 */
+	@Resource
+	private DockingPreClassifyMapper dockingPreClassifyMapper;
 
+	/***
+	 * 闆嗗洟鍒嗙被灞炴��
+	 */
+	@Resource
+	private IDockingPreViewModelService dockingPreViewModelService;
 
+	/**
+	 * 瀵硅薄鐨勬搷浣�
+	 */
+	@Resource
+	private RevisionModelUtil revisionModelUtil;
+	/***
+	 * 闆嗗洟鍒嗙被鏍戝璞℃煡
+	 *@param treeQueryObject 闆嗗洟鍒嗙被鏌ヨ瀵硅薄
+	 *@return 杩斿洖鍒嗙被鏍戝璞�
+	 */
+	@Override
+	public List<Tree> treeCompanyGroupClassify(TreeQueryObject treeQueryObject) {
+		log.info("鑾峰彇闆嗗洟鍒嗙被鏍憇tart...");
+		Map<String,String> conditionMap= treeQueryObject.getConditionMap();
+		TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME.toLowerCase(Locale.ROOT));
+		treeWrapperOptions.copyFromTreeQuery(treeQueryObject);
+		List<DockingPreClassifyVO> dockingPreClassifyVOS= getCompanyGourpClassByParentId(treeQueryObject.getParentOid(),true);
+		List<Tree> tree= revisionModelUtil.doList2Trees(dockingPreClassifyVOS,treeWrapperOptions,(DockingPreClassifyVO s) ->{
+			//鍙互鍦ㄨ繖閲屽鐞嗘爲鑺傜偣鐨勬樉绀�
+			return s.getId() + " " + s.getName() + (FrameworkDataLCStatus.DISABLED.getValue().equalsIgnoreCase(s
+				.getLcStatus()) ? (" 銆愬仠鐢ㄣ�� ") : "");
+		});
+		Iterator var6 =  tree.listIterator();
+		while(var6.hasNext()){
+			Tree trees = (Tree) var6.next();
+			boolean checkHasChild=dockingPreClassifyMapper.checkHasChild(trees.getOid());
+			//濡傛灉涓庢潯浠朵紶杩囨潵鐨勫�煎尮閰嶇殑涓婂垯璁剧疆涓洪�変腑
+			if(conditionMap.containsKey(CODE_CLASSIFY_OID_FIELD)){
+				trees.setChecked(true);
+			}
+			;
+			if(checkHasChild){
+				trees.setLeaf(false);
+			}else{
+				trees.setLeaf(true);
+			}
+		}
+		log.info("鑾峰彇闆嗗洟鍒嗙被鏍慹nd...");
+		return tree;
+	}
+
+	/***
+	 * 鏍规嵁鐖跺垎绫籭d鏌ヨ灞傜骇鏍戞暟鎹璞￠泦鍚�
+	 * @param pid 闆嗗洟鍒嗙被鐨刼id
+	 * @return 杩斿洖灞傜骇鏍戞暟鎹璞￠泦鍚�
+	 */
+	private List<DockingPreClassifyVO> getCompanyGourpClassByParentId(String pid,boolean isContainView){
+		log.info("鏍规嵁鐖跺垎绫籶id->"+pid+"鏌ヨ灞傜骇鏍戞暟鎹璞￠泦鍚坰tart...");
+		List<DockingPreClassify> doList =dockingPreClassifyMapper.selectCompanyGroupClassifyVOByTree(pid);
+		List<DockingPreClassifyVO>dockingPreClassifyVOS= DockingPreClassifyWrapper.build().entityVOs(doList);
+		if(isContainView){
+			dockingPreClassifyVOS.stream().forEach(dockingPreClassifyVO -> {
+			List<DockingPreViewModelVO> dockingViewVOS=	dockingPreViewModelService.selectDockingPreViewModelByClassId(dockingPreClassifyVO.getOid(),isContainView);
+				dockingPreClassifyVO.setDockingPreViewModelVOList(dockingViewVOS);
+			});
+		}
+		log.info("鏍规嵁鐖跺垎绫籶id->"+pid+"鏌ヨ灞傜骇鏍戞暟鎹璞￠泦鍚坋nd...");
+		return dockingPreClassifyVOS;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java
index 167036f..f03a6cf 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreMetaAttrServiceImpl.java
@@ -1,11 +1,15 @@
 package com.vci.ubcs.code.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.vci.ubcs.code.entity.DockingPreAttrMapping;
 import com.vci.ubcs.code.entity.DockingPreMetaAttr;
 import com.vci.ubcs.code.mapper.DockingPreMetaAttrMapper;
 import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
+import com.vci.ubcs.code.wrapper.DockingPreMetaAttrWrapper;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -17,6 +21,7 @@
  * @date 2023-05-23
  */
 @Service
+@Slf4j
 public class DockingPreMetaAttrServiceImpl extends ServiceImpl<DockingPreMetaAttrMapper, DockingPreMetaAttr> implements IDockingPreMetaAttrService {
 
 	@Autowired(required = false)
@@ -26,4 +31,18 @@
 	public List<DockingPreMetaAttr> selectByWrapper(Wrapper wrapper) {
 		return dockingPreMetaAttrMapper.selectList(wrapper);
 	}
+
+	/***
+	 * 鏍规嵁妯″瀷瑙嗗浘oid鏌ヨ鏁版嵁
+	 * @param viewModelId
+	 * @return 杩斿洖灞炴�у璞�
+	 */
+	@Override
+	public List<DockingPreMetaAttrVO> selectDockingPreMetaAttrByViewModelId(String viewModelId) {
+		log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 star");
+		List<DockingPreMetaAttr> dockingPreMetaAttrList= selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getViewModelId,viewModelId));
+		List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList=DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList);
+		log.info("鏍规嵁妯″瀷瑙嗗浘oid"+viewModelId+"鏌ヨ鏁版嵁 end");
+		return dockingPreMetaAttrVOList;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java
index 9b8b5de..2e322bd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingPreViewModelServiceImpl.java
@@ -1,10 +1,23 @@
 package com.vci.ubcs.code.service.impl;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.vci.ubcs.code.entity.DockingPreMetaAttr;
 import com.vci.ubcs.code.entity.DockingPreViewModel;
 import com.vci.ubcs.code.mapper.DockingPreViewModelMapper;
+import com.vci.ubcs.code.service.IDockingPreMetaAttrService;
 import com.vci.ubcs.code.service.IDockingPreViewModelService;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
+import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
+import com.vci.ubcs.code.wrapper.DockingPreMetaAttrWrapper;
+import com.vci.ubcs.code.wrapper.DockingPreViewWrapper;
+import com.vci.ubcs.starter.web.util.VciBaseUtil;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
 
 /***
  * 闆嗗洟妯″瀷鏈嶅姟
@@ -12,5 +25,46 @@
  * @date 2023-05-23
  */
 @Service
+@Slf4j
 public class DockingPreViewModelServiceImpl extends ServiceImpl<DockingPreViewModelMapper,DockingPreViewModel> implements IDockingPreViewModelService {
+
+	/***
+	 * 闆嗗洟鍒嗙被灞炴��
+	 */
+	@Resource
+	private  DockingPreViewModelMapper dockingPreViewModelMapper;
+
+
+	/***
+	 * 闆嗗洟鍒嗙被灞炴�ф煡璇㈡湇鍔�
+	 */
+	@Resource
+	private IDockingPreMetaAttrService dockingPreMetaAttrService;
+
+	/**
+	 * 鏍规嵁鍒嗙被id鏌ヨ鍒嗙被瑙嗗浘
+	 * @param classifyId 闆嗗洟鍒嗙被id
+	 * @param isContainAttr 鏄惁鏌ヨ灞炴�э紝true锛� 鏄紝false锛屽惁
+	 * @return 杩斿洖鍒嗙被妯″瀷瑙嗗浘闆嗗悎瀵硅薄
+	 */
+	@Override
+	public List<DockingPreViewModelVO> selectDockingPreViewModelByClassId(String classifyId, boolean isContainAttr) {
+		log.info("鏍规嵁鍒嗙被id->"+classifyId+",鏌ヨ鍒嗙被瑙嗗浘statr");
+		VciBaseUtil.alertNotNull(classifyId,"闆嗗洟鍒嗙被涓婚敭");
+		List<DockingPreViewModel> dockingPreViewModels= dockingPreViewModelMapper.selectList(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,classifyId));
+		List<DockingPreViewModelVO> dockingPreViewModelVOS=DockingPreViewWrapper.build().entityVOs(dockingPreViewModels);
+		if(isContainAttr) {
+			dockingPreViewModelVOS.stream().forEach(dockingPreViewModelVO -> {
+				String viewModelVOOid=dockingPreViewModelVO.getOid();
+				String sourceClassifyId=dockingPreViewModelVO.getSourceClassifyId();
+				List<DockingPreMetaAttr> dockingPreMetaAttrList=dockingPreMetaAttrService.selectByWrapper(Wrappers.<DockingPreMetaAttr>query().lambda().eq(DockingPreMetaAttr::getSourceClassifyId,sourceClassifyId).eq(DockingPreMetaAttr::getViewModelId,viewModelVOOid));
+				List<DockingPreMetaAttrVO> dockingPreMetaAttrVOList= DockingPreMetaAttrWrapper.build().entityVOs(dockingPreMetaAttrList);
+				if(!CollectionUtils.isEmpty(dockingPreMetaAttrVOList)) {
+					dockingPreViewModelVO.setDockingPreMetaAttrVOList(dockingPreMetaAttrVOList);
+				}
+			});
+		}
+		log.info("鏍规嵁鍒嗙被id->"+classifyId+",鏌ヨ鍒嗙被瑙嗗浘end");
+		return dockingPreViewModelVOS;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
index 208b9c4..93c2774 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingLogeWrapper.java
@@ -1,16 +1,67 @@
 package com.vci.ubcs.code.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.vci.ubcs.code.entity.DockingLog;
 import com.vci.ubcs.code.vo.pagemodel.DockingLogeVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 
 public class DockingLogeWrapper extends BaseEntityWrapper<DockingLog, DockingLogeVO> {
+	public static DockingLogeWrapper build() {
+		return new DockingLogeWrapper();
+	}
+
 	@Override
 	public DockingLogeVO entityVO(DockingLog entity) {
 		DockingLogeVO dockingLogeVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingLogeVO.class));
 		return dockingLogeVO;
 	}
+
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param entitys
+	 * @return
+	 */
+	public List<DockingLogeVO> entityVOs(Collection<DockingLog> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
+		List<DockingLogeVO> vos=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(vo -> {
+				vos.add(entityVO(vo));
+			});
+		}
+		return vos;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vos
+	 * @return
+	 */
+	public List<DockingLog> voentitys(Collection<DockingLogeVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+		List<DockingLog>entitys =new ArrayList<>();
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(entity -> {
+				entitys.add(voentity(entity));
+			});
+		}
+		return entitys;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vo
+	 * @return
+	 */
+	public DockingLog voentity( DockingLogeVO vo) {
+		DockingLog entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingLog.class));
+		return entity;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java
index 1266111..9954956 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreApplyFormWrapper.java
@@ -1,10 +1,14 @@
 package com.vci.ubcs.code.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.vci.ubcs.code.entity.DockingPreApplyForm;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreApplyFormVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 
 /***
@@ -13,10 +17,54 @@
  * @date 2023-05-23
  */
 public class DockingPreApplyFormWrapper extends BaseEntityWrapper<DockingPreApplyForm, DockingPreApplyFormVO> {
-
+	public static DockingPreApplyFormWrapper build() {
+		return new DockingPreApplyFormWrapper();
+	}
 	@Override
 	public DockingPreApplyFormVO entityVO(DockingPreApplyForm entity) {
 		DockingPreApplyFormVO dockingPreApplyFormVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreApplyFormVO.class));
 		return dockingPreApplyFormVO;
 	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param entitys
+	 * @return
+	 */
+	public List<DockingPreApplyFormVO> entityVOs(Collection<DockingPreApplyForm> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
+		List<DockingPreApplyFormVO> vos=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(vo -> {
+				vos.add(entityVO(vo));
+			});
+		}
+		return vos;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vos
+	 * @return
+	 */
+	public List<DockingPreApplyForm> voentitys(Collection<DockingPreApplyFormVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+		List<DockingPreApplyForm>entitys =new ArrayList<>();
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(entity -> {
+				entitys.add(voentity(entity));
+			});
+		}
+		return entitys;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vo
+	 * @return
+	 */
+	public DockingPreApplyForm voentity( DockingPreApplyFormVO vo) {
+		DockingPreApplyForm entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreApplyForm.class));
+		return entity;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
index 4db0b71..8bad0a0 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrMappingWrapper.java
@@ -2,9 +2,7 @@
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.vci.ubcs.code.entity.DockingPreAttrMapping;
-import com.vci.ubcs.code.entity.DockingPreAttrRange;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
@@ -31,14 +29,15 @@
 
 	/***
 	 * 鏁扮粍瀵硅薄杞崲
-	 * @param dockingPreAttrMappings
+	 * @param entitys
 	 * @return
 	 */
-	public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> dockingPreAttrMappings) {
+	public List<DockingPreAttrMappingVO> entityVOs(Collection<DockingPreAttrMapping> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
 		List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
-		if(!CollectionUtils.isEmpty(dockingPreAttrMappings)) {
-			dockingPreAttrMappings.stream().forEach(dockingPreAttrMapping -> {
-				dockingPreAttrMappingVOList.add(entityVO(dockingPreAttrMapping));
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(entity -> {
+				dockingPreAttrMappingVOList.add(entityVO(entity));
 			});
 		}
 		return dockingPreAttrMappingVOList;
@@ -46,14 +45,15 @@
 
 	/***
 	 * 鏁扮粍瀵硅薄杞崲
-	 * @param dockingPreAttrMappingVOS
+	 * @param vos
 	 * @return
 	 */
-	public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> dockingPreAttrMappingVOS) {
+	public List<DockingPreAttrMapping> voentitys(Collection<DockingPreAttrMappingVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
 		List<DockingPreAttrMapping> dockingPreAttrMappingList=new ArrayList<>();
-		if(!CollectionUtils.isEmpty(dockingPreAttrMappingVOS)) {
-			dockingPreAttrMappingVOS.stream().forEach(dockingPreAttrMappingVO -> {
-				dockingPreAttrMappingList.add(voentity(dockingPreAttrMappingVO));
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(vo -> {
+				dockingPreAttrMappingList.add(voentity(vo));
 			});
 		}
 		return dockingPreAttrMappingList;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
index 0df3141..f5ef92c 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreAttrRangeWrapper.java
@@ -1,11 +1,8 @@
 package com.vci.ubcs.code.wrapper;
 
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.vci.ubcs.code.entity.DockingPreAttrMapping;
 import com.vci.ubcs.code.entity.DockingPreAttrRange;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrRangeVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
@@ -32,14 +29,16 @@
 
 	/***
 	 * 鏁扮粍瀵硅薄杞崲
-	 * @param dockingPreAttrRanges
+	 * @param entitys
 	 * @return
 	 */
-	public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> dockingPreAttrRanges) {
+	public List<DockingPreAttrRangeVO> entityVOs(Collection<DockingPreAttrRange> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
 		List<DockingPreAttrRangeVO> dockingPreAttrRangeVOList=new ArrayList<>();
-		if(!CollectionUtils.isEmpty(dockingPreAttrRanges)) {
-			dockingPreAttrRanges.stream().forEach(dockingPreAttrRange -> {
-				dockingPreAttrRangeVOList.add(entityVO(dockingPreAttrRange));
+
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(entity -> {
+				dockingPreAttrRangeVOList.add(entityVO(entity));
 			});
 		}
 		return dockingPreAttrRangeVOList;
@@ -47,14 +46,15 @@
 
 	/***
 	 * 鏁扮粍瀵硅薄杞崲
-	 * @param dockingPreAttrRangeVos
+	 * @param vos
 	 * @return
 	 */
-	public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> dockingPreAttrRangeVos) {
+	public List<DockingPreAttrRange> voentitys(Collection<DockingPreAttrRangeVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
 		List<DockingPreAttrRange> dockingPreAttrRangeList=new ArrayList<>();
-		if(!CollectionUtils.isEmpty(dockingPreAttrRangeVos)) {
-			dockingPreAttrRangeVos.stream().forEach(dockingPreAttrRangeVO -> {
-				dockingPreAttrRangeList.add(voentity(dockingPreAttrRangeVO));
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(vo -> {
+				dockingPreAttrRangeList.add(voentity(vo));
 			});
 		}
 		return dockingPreAttrRangeList;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java
index 527c7b3..e57caee 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreClassifyWrapper.java
@@ -1,11 +1,14 @@
 package com.vci.ubcs.code.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.vci.ubcs.code.entity.DockingPreClassify;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 /**
  *闆嗗洟缂栫爜鍒嗙被鍖呰绫�
@@ -14,9 +17,54 @@
  * @since 2023-05-23
  */
 public class DockingPreClassifyWrapper extends BaseEntityWrapper<DockingPreClassify, DockingPreClassifyVO> {
+	public static DockingPreClassifyWrapper build() {
+		return new DockingPreClassifyWrapper();
+	}
 	@Override
 	public DockingPreClassifyVO entityVO(DockingPreClassify entity) {
 		DockingPreClassifyVO dockingPreClassifyVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreClassifyVO.class));
 		return dockingPreClassifyVO;
 	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param entitys
+	 * @return
+	 */
+	public List<DockingPreClassifyVO> entityVOs(Collection<DockingPreClassify> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
+		List<DockingPreClassifyVO> vos=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(vo -> {
+				vos.add(entityVO(vo));
+			});
+		}
+		return vos;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vos
+	 * @return
+	 */
+	public List<DockingPreClassify> voentitys(Collection<DockingPreClassifyVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+		List<DockingPreClassify>entitys =new ArrayList<>();
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(entity -> {
+				entitys.add(voentity(entity));
+			});
+		}
+		return entitys;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vo
+	 * @return
+	 */
+	public DockingPreClassify voentity( DockingPreClassifyVO vo) {
+		DockingPreClassify entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreClassify.class));
+		return entity;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java
index b0f0021..e880044 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreMetaAttrWrapper.java
@@ -1,12 +1,14 @@
 package com.vci.ubcs.code.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.vci.ubcs.code.entity.DockingPreMetaAttr;
-import com.vci.ubcs.code.entity.DockingPreViewModel;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreMetaAttrVO;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 /**
  *闆嗗洟缂栫爜鐢宠妯″瀷灞炴�у寘瑁呯被
@@ -15,9 +17,58 @@
  * @since 2023-05-23
  */
 public class DockingPreMetaAttrWrapper extends BaseEntityWrapper<DockingPreMetaAttr, DockingPreMetaAttrVO> {
+
+	public static DockingPreMetaAttrWrapper build() {
+		return new DockingPreMetaAttrWrapper();
+	}
+
 	@Override
 	public DockingPreMetaAttrVO entityVO(DockingPreMetaAttr entity) {
 		DockingPreMetaAttrVO dockingPreMetaAttrVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreMetaAttrVO.class));
 		return dockingPreMetaAttrVO;
 	}
+
+
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param entitys
+	 * @return
+	 */
+	public List<DockingPreMetaAttrVO> entityVOs(Collection<DockingPreMetaAttr> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
+		List<DockingPreMetaAttrVO> vos=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(vo -> {
+				vos.add(entityVO(vo));
+			});
+		}
+		return vos;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vos
+	 * @return
+	 */
+	public List<DockingPreMetaAttr> voentitys(Collection<DockingPreMetaAttrVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+		List<DockingPreMetaAttr>entitys =new ArrayList<>();
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(entity -> {
+				entitys.add(voentity(entity));
+			});
+		}
+		return entitys;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vo
+	 * @return
+	 */
+	public DockingPreMetaAttr voentity( DockingPreMetaAttrVO vo) {
+		DockingPreMetaAttr entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreMetaAttr.class));
+		return entity;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java
index 4823305..518e96f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/wrapper/DockingPreViewWrapper.java
@@ -1,11 +1,14 @@
 package com.vci.ubcs.code.wrapper;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.vci.ubcs.code.entity.DockingPreViewModel;
-import com.vci.ubcs.code.vo.pagemodel.DockingPreClassifyVO;
 import com.vci.ubcs.code.vo.pagemodel.DockingPreViewModelVO;
 import org.springblade.core.mp.support.BaseEntityWrapper;
 import org.springblade.core.tool.utils.BeanUtil;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
 import java.util.Objects;
 /**
  *闆嗗洟缂栫爜鐢宠瑙嗗浘鍖呰绫�
@@ -14,9 +17,54 @@
  * @since 2023-05-23
  */
 public class DockingPreViewWrapper  extends BaseEntityWrapper<DockingPreViewModel, DockingPreViewModelVO> {
+	public static DockingPreViewWrapper build() {
+		return new DockingPreViewWrapper();
+	}
 	@Override
 	public DockingPreViewModelVO entityVO(DockingPreViewModel entity) {
 		DockingPreViewModelVO dockingPreViewModelVO = Objects.requireNonNull(BeanUtil.copy(entity, DockingPreViewModelVO.class));
 		return dockingPreViewModelVO;
 	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param entitys
+	 * @return
+	 */
+	public List<DockingPreViewModelVO> entityVOs(Collection<DockingPreViewModel> entitys) {
+		if(CollectionUtils.isEmpty(entitys)) {return new ArrayList<>();}
+		List<DockingPreViewModelVO> vos=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(entitys)) {
+			entitys.stream().forEach(dockingPreAttrRange -> {
+				vos.add(entityVO(dockingPreAttrRange));
+			});
+		}
+		return vos;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vos
+	 * @return
+	 */
+	public List<DockingPreViewModel> voentitys(Collection<DockingPreViewModelVO> vos) {
+		if(CollectionUtils.isEmpty(vos)) {return new ArrayList<>();}
+		List<DockingPreViewModel>entitys =new ArrayList<>();
+		if(!CollectionUtils.isEmpty(vos)) {
+			vos.stream().forEach(entity -> {
+				entitys.add(voentity(entity));
+			});
+		}
+		return entitys;
+	}
+
+	/***
+	 * 鏁扮粍瀵硅薄杞崲
+	 * @param vo
+	 * @return
+	 */
+	public DockingPreViewModel voentity( DockingPreViewModelVO vo) {
+		DockingPreViewModel entity = Objects.requireNonNull(BeanUtil.copy(vo, DockingPreViewModel.class));
+		return entity;
+	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
index 67e62cf..1096c57 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/application-dev.yml
@@ -12,6 +12,10 @@
 mybatis-plus:
   configuration:
     map-underscore-to-camel-case: false
+docking:
+  apply:
+    jtInterUrl: http://116.205.176.185:8099
+    unitCode: 410-MDM
 
 ######搴旂敤鍩烘湰閰嶇疆
 #app:
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml
index af4f902..ce43015 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingLogeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.DockingLogeMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingLog">
+    <resultMap id="plDockingLogResultMap" type="com.vci.ubcs.code.entity.DockingLog">
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml
index 58c86ca..32a794f 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreApplyFormMapper.xml
@@ -33,6 +33,10 @@
         <result column="CONTENT" property="content"/>
         <result column="DATAOID" property="dataOid"/>
         <result column="DATABTMNAME" property="dataBtmName"/>
-        <result column="MSG" property="msg"/>
+        <result column="MSG" property="msg"  />
+        <result column="OPERATIONTYPE" property="operationType" />
+        <result column="GROUPCODE" property="groupCode" />
     </resultMap>
+
+
 </mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
index a6a0649..c75f1f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrMappingMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrMappingMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrMapping">
+    <resultMap id="plDockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrMapping">
             <result column="OID" property="oid"/>
             <result column="REVISIONOID" property="revisionOid"/>
             <result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
index 903ee79..dbb11bc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreAttrRangeMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.DockingPreAttrRangeMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrRange">
+    <resultMap id="plDockingPreAttrRangeResultMap" type="com.vci.ubcs.code.entity.DockingPreAttrRange">
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml
index 89fc815..7c45672 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreClassifyMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.DockingPreClassifyMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreClassify">
+    <resultMap id="plDockingClassifyResultMap" type="com.vci.ubcs.code.entity.DockingPreClassify">
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
@@ -34,5 +34,51 @@
         <result column="NODELINKNAME" property="getNodeLinkName"/>
         <result column="PID" property="pid"/>
     </resultMap>
+    <select id="selectCompanyGroupClassifyVOByTree" resultMap="plDockingClassifyResultMap">
+        select codeclassify0.OID                 as oid,
+        codeclassify0.REVISIONOID             as revisionoid,
+        codeclassify0.NAMEOID              as nameOid,
+        codeclassify0.BTMNAME            as btmname,
+        codeclassify0.LASTR          as lastr,
+        codeclassify0.FIRSTR              as firstr,
+        codeclassify0.LASTV           as lastv,
+        codeclassify0.FIRSTV           as firstv,
+        codeclassify0.CREATOR           as creator,
+        codeclassify0.CREATETIME           as createtime,
+        codeclassify0.LASTMODIFIER           as lastmodifier,
+        codeclassify0.LASTMODIFYTIME        as lastmodifytime,
+        codeclassify0.REVISIONRULE        as revisionrule,
+        codeclassify0.VERSIONRULE        as versionrule,
+        codeclassify0.REVISIONSEQ        as revisionseq,
+        codeclassify0.REVISIONVALUE        as revisionvalue,
+        codeclassify0.VERSIONSEQ        as versionseq,
+        codeclassify0.VERSIONVALUE        as versionvalue,
+        codeclassify0.LCTID        as lctid,
+        codeclassify0.LCSTATUS              as lcstatus,
+        codeclassify0.OID                   as oid,
+        codeclassify0.TS                    as ts,
+        codeclassify0.DESCRIPTION           as description,
+        codeclassify0.OWNER                 as owner,
+        codeclassify0.COPYFROMVERSION       as copyfromversion,
+        codeclassify0.ID                    as id,
+        codeclassify0.NAME                  as name,
+        codeclassify0.CLASSNAME               as classname,
+        codeclassify0.NODELINK   as nodelink,
+        codeclassify0.NODELINKNAME   as nodelinkname,
+        codeclassify0.PID   as pid
+        from PL_CODE_JCLASSIFY codeclassify0
+        <where>
+            <if test="oid != null and oid != ''">
+                codeclassify0.pid = '${oid}'
+            </if>
+            <if test="oid = null">
+                codeclassify0.pid is null
+            </if>
+        </where>
+        order by id asc
+    </select>
 
+    <select id="checkHasChild" resultType="java.lang.Boolean">
+        select count(oid) from PL_CODE_JCLASSIFY  where pid = #{oid}
+    </select>
 </mapper>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
index f30a2ca..c1f8fa4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreMetaAttrMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.DockingPreMetaAttrMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreMetaAttr">
+    <resultMap id="plDockingPreMetaAttrResultMap" type="com.vci.ubcs.code.entity.DockingPreMetaAttr">
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml
index 8801524..f88b982 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/DockingPreViewMapper.xml
@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.vci.ubcs.code.mapper.DockingPreViewModelMapper">
     <!-- 閫氱敤鏌ヨ鏄犲皠缁撴灉 -->
-    <resultMap id="DockingPreAttrMappingResultMap" type="com.vci.ubcs.code.entity.DockingPreViewModel">
+    <resultMap id="plDockingPreViewModelResultMap" type="com.vci.ubcs.code.entity.DockingPreViewModel">
         <result column="OID" property="oid"/>
         <result column="REVISIONOID" property="revisionOid"/>
         <result column="NAMEOID" property="nameOid"/>

--
Gitblit v1.9.3