From 68ea1b1eb9e8c48b44369528792ead8726571716 Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期五, 29 十二月 2023 10:59:01 +0800
Subject: [PATCH] 1、erp接口集成的改动与集团集成的改动功能。

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java                                          |    2 +-
 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingClassifyViewVO.java      |    6 +++---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java |   17 ++++++++++++-----
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java                |    2 +-
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingClassifyViewVO.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingClassifyViewVO.java
index 55513d8..643bdb3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingClassifyViewVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/vo/DockingClassifyViewVO.java
@@ -17,7 +17,7 @@
 	/***
 	 * 褰卞搷缂栫爜椤圭殑鏁版嵁
 	 */
-	private String impactList;
+	private List<List<String>> impactList;
 
 	/**
 	 * 妯″瀷瑙嗗浘灞炴�ч泦鍚�
@@ -35,10 +35,10 @@
 	public void setMetaList(List<DockingClassifyMetaAttrVO> metaList) {
 		this.metaList = metaList;
 	}
-	public String getImpactList() {
+	public List<List<String>> getImpactList() {
 		return impactList;
 	}
-	public void setImpactList(String impactList) {
+	public void setImpactList(List<List<String>> impactList) {
 		this.impactList = impactList;
 	}
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 852fe8e..c2aaae4 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -305,7 +305,7 @@
 
 			for (DockingClassifyViewVO viewInfo : list) {
 				String viewName =StringUtils.isBlank(viewInfo.getViewName())?"":viewInfo.getViewName();
-				String impactList = StringUtils.isBlank(viewInfo.getImpactList())?"":viewInfo.getImpactList();
+				String impactList = viewInfo.getImpactList() == null ? "" : viewInfo.getImpactList().get(0).get(0);
 				log.info("VilewMode:-------------->瑙嗗浘鍚嶇О:"+viewName);
 				log.info("VilewMode:-------------->褰卞搷缂栫爜椤�:"+impactList);
 				log.info("VilewMode:--------------> 闆嗗洟鍒嗙被涓婚敭:"+jclassId);
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index 3db3194..3e9a87c 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -238,6 +238,11 @@
 		//List<BaseModelVO> codeWupins=mdmEngineService.listByIds(VciBaseUtil.str2List(oids));
 		List<BaseModel> dataModelList = new ArrayList<>();
 		try {
+			R<List<BaseModel>> listR = mdmEngineClient.selectByTypeAndOid(btmName, oids);
+			if(listR.getData().size() == 0){
+				return R.fail("涓烘煡璇㈠埌鐩稿叧涓氬姟鏁版嵁锛�");
+			}
+			dataModelList = listR.getData();
 			if (!CollectionUtils.isEmpty(dataModelList)) {
 				DockingGroupDataVO dockingGroupDataVO = new DockingGroupDataVO();
 				//鐢宠鍗曞拰鐢宠鍗曞璞″叧绯�
@@ -582,9 +587,9 @@
 	 */
 	private boolean saveDatas(DockingQueryClassModelVO dockingQueryClassifyModelVO) throws Throwable {
 		try {
-			DockingClassifyMainVO mainData = dockingQueryClassifyModelVO.getMainData();
-			List<DockingClassifyVO> classList = mainData.getClassList();
-			Map<String,List<DockingClassifyViewVO>>classInfoMap = mainData.getClassInfos();
+			DockingClassifyMainVO data = dockingQueryClassifyModelVO.getData();
+			List<DockingClassifyVO> classList = data.getClassList();
+			Map<String,List<DockingClassifyViewVO>>classInfoMap = data.getClassInfos();
 			////initVCIInvocationInfo("1");
 			List<DockingPreClassify> dockingPreClassifyArrayList=new ArrayList<>();
 			for (DockingClassifyVO jclassObject : classList) {
@@ -643,14 +648,14 @@
 			Map<String, DockingPreViewModel> jviewmodelMap = new HashMap<String, DockingPreViewModel>();
 			//Map<String, String> condtionMa = new HashMap<String, String>();
 			//	condtionMa.put("jsourceclsfid", jclassId);
-			List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,false));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
+			List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,jclassId));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
 			for (DockingPreViewModel dockingPreViewModel : dockingPreViewModelList) {
 				jviewmodelMap.put(dockingPreViewModel.getViewName(),dockingPreViewModel);
 			}
 
 			for (DockingClassifyViewVO viewInfo : list) {
 				String viewName = com.alibaba.cloud.commons.lang.StringUtils.isBlank(viewInfo.getViewName())?"":viewInfo.getViewName();
-				String impactList = com.alibaba.cloud.commons.lang.StringUtils.isBlank(viewInfo.getImpactList())?"":viewInfo.getImpactList();
+				String impactList = viewInfo.getImpactList() == null ? "" : viewInfo.getImpactList().get(0).get(0);
 				log.info("VilewMode:-------------->瑙嗗浘鍚嶇О:"+viewName);
 				log.info("VilewMode:-------------->褰卞搷缂栫爜椤�:"+impactList);
 				log.info("VilewMode:--------------> 闆嗗洟鍒嗙被涓婚敭:"+jclassId);
@@ -743,6 +748,8 @@
 					List<DockingClassifyMetaAttrVO> childMetaList = new ArrayList<>();
 					childMetaList.add(compositeMeta);
 					getMetaAttrObject(childMetaList, jclassId,jviewModelObject, pid,allDockingPreMetaAttrList);
+				}else{
+					allDockingPreMetaAttrList.add(dockingPreMetaAttr);
 				}
 
 			}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 6f47399..e910019 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -2740,7 +2740,7 @@
 		//cboOidMap.put("id", QueryOptionConstant.IN + "(" + VciBaseUtil.toInSql(codeDataMap.keySet().toArray(new String[0])) + ")");
 		String tableName ="";
 		try {
-			R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(codeClassifyVO.getBtmTypeId());
+			R<BtmTypeVO> r = btmTypeClient.getAllAttributeByBtmId(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
 			if(!r.isSuccess()) {
 				throw new Throwable(r.getMsg());
 			}

--
Gitblit v1.9.3