From d2b250df8194ebfa6ba648771874b114e04b17f3 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 15 六月 2023 18:42:16 +0800
Subject: [PATCH] 集统一集成接口添加
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 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 118c0c2..aa4955c 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
@@ -1913,7 +1913,7 @@
Map<String, CodeOrderDTO> orderDTOMap = codeOrderDTOList.stream().filter(orderDTO -> orderDTO != null && StringUtils.isNotBlank(orderDTO.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
List<BaseModel> updateList = new ArrayList<>();
List<CodeAllCode> codeAllCodeList = new ArrayList<>();
- List<BaseModel> deleteList = new ArrayList<>();
+ List<String> deleteList = new ArrayList<>();
CodeClassifyTemplateVO firstTemplateVO = templateService.getObjectHasAttrByOid(orderDTOMap.values().stream().findFirst().get().getTemplateOid());
Map<String, ClientBusinessObject> cboMap = cboList.stream().filter(cbo -> cbo != null).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId(), t -> t));
@@ -1964,6 +1964,15 @@
} catch (VciBaseException e) {
e.printStackTrace();
}
+
+ List<CodeAllCode>newCodeAllCodeList= codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCreateCodeOid, cbo.getOid()));
+ if (!CollectionUtils.isEmpty(newCodeAllCodeList)) {
+ CodeAllCode codeCbo = codeAllCodeList.get(0);
+ log.info("codeCbos code:" + codeCbo.getId());
+ codeCbo.setLcStatus(status);
+ codeAllCodeList.add(codeCbo);
+ }
+
BaseModel baseModel=new BaseModel();
BeanUtil.convert(cbo,baseModel);
baseModel.setData(VciBaseUtil.objectToMapString(cbo));
@@ -1973,8 +1982,6 @@
// errorMap.put(code,errorMap.getOrDefault(code, errorMap.getOrDefault(code,"")+";鏁版嵁"+code+"鍦ㄦ祦绋嬩腑锛屼笉鍏佽鍒犻櫎!"));
//}else {
try {
- Map<String, String> condtionMap = new HashMap<>();
- condtionMap.put("createcodeoid", cbo.getOid());
log.info("oid:" + cbo.getOid());
List<CodeAllCode>newCodeAllCodeList= codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCreateCodeOid, cbo.getOid()));
log.info("codeCbos size:" + newCodeAllCodeList.size());
@@ -1984,7 +1991,7 @@
codeCbo.setLcStatus(CodeDefaultLC.TASK_BACK.getValue());
codeAllCodeList.add(codeCbo);
}
- deleteList.add(cbo);
+ deleteList.add(cbo.getOid());
}catch (VciBaseException e) {
e.printStackTrace();
}
@@ -1998,6 +2005,15 @@
cbo.setAttributeValue("lcstatus", status);
// }
+
+ List<CodeAllCode>newCodeAllCodeList= codeAllCodeService.selectByWrapper(Wrappers.<CodeAllCode>query().lambda().eq(CodeAllCode::getCreateCodeOid, cbo.getOid()));
+ if (!CollectionUtils.isEmpty(newCodeAllCodeList)) {
+ CodeAllCode codeCbo = codeAllCodeList.get(0);
+ log.info("codeCbos code:" + codeCbo.getId());
+ codeCbo.setLcStatus(status);
+ codeAllCodeList.add(codeCbo);
+ }
+
BaseModel baseModel=new BaseModel();
BeanUtil.convert(cbo,baseModel);
baseModel.setData(VciBaseUtil.objectToMapString(cbo));
@@ -2029,9 +2045,9 @@
try {
engineService.updateBatchByBaseModel(classifyFullInfo.getTopClassifyVO().getBtmtypeid(),updateList);
codeAllCodeService.saveBatch(codeAllCodeList);
- commonsMapper.deleteByTaleAndOid("",null);
-
- // engineService.del(deleteList);
+ if(deleteList.size()>0) {
+ commonsMapper.deleteByTaleAndOid(tableName, VciBaseUtil.array2String(deleteList.toArray(new String[]{})));
+ }
errorid="0";
msg="鏇存柊/鐘舵�佹洿鏀�/鍒犻櫎鎴愬姛锛�";
}catch (Throwable e){
--
Gitblit v1.9.3