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

@@ -1016,7 +1016,7 @@
               thisCbos.stream().forEach(clientBusinessObject -> {
                  BaseModel baseModel=new BaseModel();
                  BeanUtil.convert(clientBusinessObject,baseModel);
                  baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                  //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
                  dataCBOList.add(baseModel);
                  dataCBOIdList.add(baseModel);
               });
@@ -1030,9 +1030,14 @@
                        String rowIndex = cbo.getAttributeValue(IMPORT_ROW_INDEX);
                        errorMap.put(rowIndex, errorMap.getOrDefault(rowIndex, "") + ";系统错误，存储数据的时候出错了");
                     });

                  }
               }
            });
            if (errorMap.size() > 0) {
               isExport = true;
            }
            createWriteExcelData(rowDataList, errorMap, new ArrayList<>(), titleRowData, shetNameMap, finalTemplateVO);
            engineService.batchSaveSelectChar(templateVO, dataCBOIdList);
         }
      }
@@ -1061,7 +1066,19 @@

      return codeImProtRusultVO;
   }
   /*private void converBaseModels(List<ClientBusinessObject> clientBusinessObjects,List<BaseModel>dataCBOList){
      clientBusinessObjects.stream().forEach(clientBusinessObject -> {
         BaseModel baseModel=new BaseModel();
         BeanUtil.convert(clientBusinessObject,baseModel);
         Map<String,String> dataMap=new HashMap<>();
         clientBusinessObject.getHisAttrValList()
         baseModel.setData(VciBaseUtil.objectToMapString(baseModel));

         AttributeValue[] newAttributeValue=    clientBusinessObject.getNewAttrValList();
         dataCBOList.add(baseModel);
      });

   }*/
   /***
    * 从execl里构建对象
    * @param rowDataList
@@ -1338,7 +1355,7 @@
            cboList.stream().forEach(clientBusinessObject -> {
               BaseModel baseModel=new BaseModel();
               BeanUtil.convert(clientBusinessObject,baseModel);
               baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
               //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
               dataCBOList.add(baseModel);
               dataCBOIdList.add(baseModel.getOid());
            });
@@ -1528,7 +1545,7 @@
            needSaveCboList.stream().forEach(clientBusinessObject -> {
               BaseModel baseModel=new BaseModel();
               BeanUtil.convert(clientBusinessObject,baseModel);
               baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
               //baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
               dataCBOList.add(baseModel);
//               allNeedSaveCboList.add(baseModel);
            });
@@ -1802,7 +1819,7 @@
         needSaveCboList.stream().forEach(clientBusinessObject -> {
            BaseModel baseModel=new BaseModel();
            BeanUtil.convert(clientBusinessObject,baseModel);
            baseModel.setData(VciBaseUtil.objectToMapString(clientBusinessObject));
         //(VciBaseUtil.objectToMapString(clientBusinessObject));
            dataCBOList.add(baseModel);
            allNeedSaveCboList.add(baseModel.getOid());
         });
@@ -2004,7 +2021,7 @@

            BaseModel baseModel=new BaseModel();
            BeanUtil.convert(cbo,baseModel);
            baseModel.setData(VciBaseUtil.objectToMapString(cbo));
            //baseModel.setData(VciBaseUtil.objectToMapString(cbo));
            updateList.add(baseModel);
         }else if(operation.equals("delete")){//如果在流程中不允许删除，不在流程中状态为发布或者停用的数据不允许删除，将其更改为停用，其他的情况直接删除
            //  if(finalIsProcess){
@@ -2045,7 +2062,7 @@

               BaseModel baseModel=new BaseModel();
               BeanUtil.convert(cbo,baseModel);
               baseModel.setData(VciBaseUtil.objectToMapString(cbo));
               //baseModel.setData(VciBaseUtil.objectToMapString(cbo));
               updateList.add(baseModel);
            }catch (VciBaseException e) {
               e.printStackTrace();