From c3c9baf912f572a78b2b82613d31889be187ab92 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 03 七月 2023 23:53:56 +0800
Subject: [PATCH] 历史导入修改
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
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 ad6059a..90a9ab3 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
@@ -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);
+ });
+
+ }*/
/***
* 浠巈xecl閲屾瀯寤哄璞�
* @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();
--
Gitblit v1.9.3