From a216d2503641b1d2ae6d4a2defa870470f2737bb Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 18 九月 2023 14:14:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
index 1f85f08..0452c25 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java
@@ -106,7 +106,7 @@
public R getApplyGroupCode(DockingReturnStoreVO dockingReturnStoreVO) {
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� start");
try {
- List<BaseModel> editObjectList = new ArrayList();
+ Map<String,List<BaseModel>> editObjectMap = new HashMap<>();
List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
//String classId = javaObject.getClassId();
@@ -167,18 +167,24 @@
if (res) {
//姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀�
BaseModel baseModel = new BaseModel();
- baseModel.setId("10" + customCoding);
+ String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+ if(partCoe.equals(classOid)){
+ baseModel.setId(10+customCoding);
+ }
+ String btmeName=baseModel.getBtmname();
baseModel.getData().put("groupcode",customCoding);
log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId());
- editObjectList.add(baseModel);
+ editObjectMap.getOrDefault(btmeName,new ArrayList<>()).add(baseModel);
+
}
- List<String> dataOidList=new ArrayList<>();
- dataOidList.add(jdataid);
+ }
+ if(!CollectionUtils.isEmpty(editObjectMap)) {
//璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
- mdmEngineClient.updateBatchByType(jdatabtmname,editObjectList);
+ editObjectMap.forEach((btmName, modeList) -> {
+ mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
+ });
}
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
-
}catch (Throwable e){
e.printStackTrace();
return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
--
Gitblit v1.9.3