Merge remote-tracking branch 'origin/master'

 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;
      }

    },

 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() {

 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;
    }
}

 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);

 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);
                }

            }

 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());
            }