From a475adaeba4b9954ed19f5ece005e95971ed4b0e Mon Sep 17 00:00:00 2001 From: ludc Date: 星期日, 04 二月 2024 13:03:38 +0800 Subject: [PATCH] 内外网开发环境代码合并 --- Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 25 ++++++++++++++++--------- 1 files changed, 16 insertions(+), 9 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 c2aaae4..efecb25 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 @@ -185,16 +185,23 @@ String jdatabtmname = dockingPreApplyForm.getDataBtmName(); if (res) { //姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀� - BaseModel baseModel = new BaseModel(); - String classOid=baseModel.getData().getOrDefault("CODECLSFID",""); - if(partCoe.equals(classOid)){ - baseModel.setId(10+customCoding); + R<List<BaseModel>> R=mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid); + if(R.isSuccess()){ + List<BaseModel> oldDatalist=new ArrayList<>(); + List<BaseModel> newDatalist=R.getData(); + if(!CollectionUtils.isEmpty(newDatalist)){ + if(editObjectMap.containsKey(jdatabtmname)){ + oldDatalist=editObjectMap.getOrDefault(jdatabtmname,new ArrayList<>()); + } + BaseModel baseModel=oldDatalist.get(0); + //DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel); + baseModel.setLastModifyTime(new Date()); + baseModel.getData().put("groupcode",customCoding); + log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId()); + oldDatalist.add(baseModel); + editObjectMap.put(jdatabtmname,oldDatalist); + } } - String btmeName=baseModel.getBtmname(); - baseModel.getData().put("groupcode",customCoding); - log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId()); - editObjectMap.getOrDefault(btmeName,new ArrayList<>()).add(baseModel); - } } if(!CollectionUtils.isEmpty(editObjectMap)) { -- Gitblit v1.9.3