Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java

@@ -175,8 +175,8 @@
                              baseModel.setId(10+customCoding);
                           }
                           BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
                           DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
                           DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
                           DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
                           DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);

                           baseModel.getData().getOrDefault("groupCode", customCoding);
                           updateCbos.add(baseModel);//更新数据集团code
@@ -189,14 +189,14 @@
                     dockingPreApplyForm.setMsg("申请：" + msg);
                     dockingPreApplyForm.setContent("");
                     dockingPreApplyForm.setGroupCode("");
                     DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
                     DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
                  });
                  addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
                     dockingPreApplyForm.setCode("2");
                     dockingPreApplyForm.setMsg("申请：" + msg);
                     dockingPreApplyForm.setContent("");
                     dockingPreApplyForm.setGroupCode("");
                     DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
                     DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
                  });
               }
               if (editDockingPreApplyFormMap.size() > 0) {
@@ -300,7 +300,7 @@
                        if(partCoe.equals(classOid)){
                           baseModel.setId(10+customCoding);
                        }
                        DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
                        DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel,null);
                        //   baseModel.setId(customCoding);
                        baseModel.getData().put("groupCode", customCoding);
                        updateCbos.add(baseModel);//更新数据集团code
@@ -313,14 +313,14 @@
                  dockingPreApplyForm.setMsg("修改：" + msg);
                  dockingPreApplyForm.setContent("");
                  dockingPreApplyForm.setGroupCode("");
                  DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm);
                  DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreApplyForm,null);
               });
               addDockingPreApplyFormMap.forEach((key, dockingPreApplyForm) -> {
                  dockingPreApplyForm.setCode("2");
                  dockingPreApplyForm.setMsg("修改：" + msg);
                  dockingPreApplyForm.setContent("");
                  dockingPreApplyForm.setGroupCode("");
                  DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM);
                  DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreApplyForm, MdmBtmTypeConstant.DOCKING_PRE_JAPPLYFORM,null);
               });
            }
            if (editDockingPreApplyFormMap.size() > 0) {
@@ -439,9 +439,9 @@
                  log.info("classify:-------------->链接名称:"+nodeLinkName);
                  log.info("classify:-------------->链接版本:"+version);
                  if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
                     DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY);
                     DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
                  } else {
                     DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
                     DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
                  }
                  dockingPreClassify.setOid(id);
                  dockingPreClassify.setName(className);
@@ -603,9 +603,9 @@
            log.info("classify:-------------->链接名称:"+nodeLinkName);

            if (dockingPreClassify == null || StringUtils.isBlank(dockingPreClassify.getOid())) {
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY);
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreClassify,MdmBtmTypeConstant.DOCKING_PRE_JCLASSIFY,null);
            } else {
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreClassify,null);
            }
            dockingPreClassify.setOid(id);
            dockingPreClassify.setName(className);
@@ -660,10 +660,10 @@
               jviewModelObject = jviewmodelMap.get(viewName);
               //影响编码项的数据
               jviewModelObject.setImpactList(impactList);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(jviewModelObject,null);
            } else {
               jviewModelObject =new DockingPreViewModel();
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL);
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(jviewModelObject,MdmBtmTypeConstant.DOCKING_PRE_JVIEWMODEL,null);
               jviewModelObject.setSourceClassifyId(jclassId);// 集团分类id
               jviewModelObject.setViewName(viewName);// 集团视图名称
               //影响编码项的数据
@@ -718,9 +718,9 @@
               dockingPreMetaAttr = jmetaattrMap.get(englishName);
               dockingPreMetaAttr.setChineseName(chineseName);
               dockingPreMetaAttr.setDefaultValue(defaultValue);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(dockingPreMetaAttr,null);
            } else {
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR);
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(dockingPreMetaAttr,MdmBtmTypeConstant.DOCKING_PRE_JMETAATRR,null);
               dockingPreMetaAttr.setSourceClassifyId(jclassId);// 集团分类id
               dockingPreMetaAttr.setViewModelId(jviewModelObject.getOid());// 集团视图模型id
               dockingPreMetaAttr.setChineseName(chineseName);// 属性名称
@@ -782,9 +782,9 @@
               rangeObject = rangeMap.get(rangeKey);
               rangeObject.setNumTextValue(keyValue);
               rangeObject.setNumText(rangeKey);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject);
               DefaultAttrAssimtUtil.updateDefaultAttrAssimt(rangeObject,null);
            } else {
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE);
               DefaultAttrAssimtUtil.addDefaultAttrAssimt(rangeObject,MdmBtmTypeConstant.DOCKING_PRE_JRANGE,null);
               rangeObject.setNumTextValue(keyValue);
               rangeObject.setNumText(rangeKey);
               rangeObject.setTs(rangeObject.getLastModifyTime());