From c520fd24a5f0f38290a1ccbc6ed2195de43463cb Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 17 十一月 2023 12:39:56 +0800
Subject: [PATCH] 在·
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 23 +++++++++++++----------
1 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index a515f25..f8946ea 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -976,10 +976,10 @@
// cbo.setLcStatus("Editing");
//// cbo.setLcStatus(lifeCycleVO.getStartStatus());
// } else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
+ cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
// }
} else {
- cbo.setLcStatus(CodeDefaultLC.EDITING.getValue());
+ cbo.setLcStatus(CodeDefaultLC.RELEASED.getValue());
}
}
@@ -994,7 +994,6 @@
logger.error("璁剧疆榛樿鐨勫睘鎬х殑鍊奸敊璇�", e);
}
}
-
/**
* 鍒濆鍖栦笟鍔＄被鍨�
@@ -2774,6 +2773,7 @@
cbo.setName(orderDTO.getName());
//鏁版嵁鐨勬椂鍊欙紝缂栫爜鏄笉鍙樼殑
cbo.setCreateTime(cbo.getCreateTime());
+ cbo.setCreator(cbo.getCreator());
cbo.setLastModifyTime(cbo.getLastModifyTime());
cbo.setTenantId(AuthUtil.getTenantId());
oldCbo.setLastV("0");
@@ -3595,12 +3595,15 @@
for (int i = 0; i < threadSafeMaps.size(); i += MAX_IMPORT_NUM) {
final int startIndex = i;
final int endIndex = Math.min(i + MAX_IMPORT_NUM, threadSafeMaps.size());
-
- executor.execute(() -> {
- List<Map<String, String>> subList = threadSafeMaps.subList(startIndex, endIndex);
- // 璋冪敤鎻掑叆鏁版嵁搴撶殑鏂规硶
- commonsMapper.insertByBaseModel(tableName, threadSafeMaps.get(0), subList);
- });
+ try {
+ executor.execute(() -> {
+ List<Map<String, String>> subList = threadSafeMaps.subList(startIndex, endIndex);
+ // 璋冪敤鎻掑叆鏁版嵁搴撶殑鏂规硶
+ commonsMapper.insertByBaseModel(tableName, threadSafeMaps.get(0), subList);
+ });
+ }catch (Throwable e){
+ throw new ServiceException(e.getMessage());
+ }
}
// 鍏抽棴绾跨▼姹�
@@ -4188,7 +4191,7 @@
toBo.setLastV(String.valueOf(1));
// 鏁版嵁鍗囩増涓嶉渶瑕侀噸鏂拌缃垱寤轰汉锛屽彧瀵规渶鍚庝慨鏀逛汉鍋氭洿鏂板氨鍙互浜�
//toBo.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- toBo.setCreateTime(new Date());
+ toBo.setCreateTime(fromBo.getCreateTime());
// toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
toBo.setLastModifier(String.valueOf(AuthUtil.getUser().getAccount()));
toBo.setLastModifyTime(new Date());
--
Gitblit v1.9.3