From 2e5bace04a71955164c1df5d4e4344760b11d247 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 29 十二月 2023 13:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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-WEB/src/views/integration/integrationIndex.vue | 4 ++--
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 2 +-
Source/UBCS-WEB/src/views/integration/integrationTransfer.vue | 6 ------
6 files changed, 19 insertions(+), 18 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
index 72b09d6..77badef 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationIndex.vue
@@ -268,7 +268,7 @@
// 鎺ュ彛鑾峰彇闆嗗洟鍒嗙被鏍�
async referTree(oid, checked) {
this.groupTreeData = []
- const response = await referTree({'conditionMap[codeclsfid]': oid, parentOid: '0'})
+ const response = await referTree({'conditionMap[codeclsfid]': oid, parentOid:'0'})
if (response.status === 200) {
if (checked) {
let items = response.data.map(item => {
@@ -331,7 +331,7 @@
const findRow = that.mappingData.findIndex(item => item.metaListId === that.mappingForm.metaListId)
that.mappingData[findRow].targetAttrName = transferValue[0].name
that.mappingData[findRow].targetAttrId = transferValue[0].oid
- this.dialogPush = false
+ this.dialogPush = false;
}
},
diff --git a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
index 7793e02..ef55872 100644
--- a/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
+++ b/Source/UBCS-WEB/src/views/integration/integrationTransfer.vue
@@ -78,12 +78,6 @@
dialogVisible(n) {
this.$emit('update:visible', n)
},
- data(n) {
- console.log('n', n)
- },
- newdata(n) {
- console.log('newdata', n)
- }
},
computed: {
newdata() {
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