From ae5807029edabde0b1e1488c090bd830fccf75a7 Mon Sep 17 00:00:00 2001 From: ludc Date: 星期一, 18 九月 2023 16:13:07 +0800 Subject: [PATCH] 代码提交 --- Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 28 +++++++++++++++++----------- 1 files changed, 17 insertions(+), 11 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 49df7b6..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 @@ -16,6 +16,7 @@ import org.springblade.core.tenant.annotation.NonDS; import org.springblade.core.tool.api.R; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Value; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.CollectionUtils; import org.springframework.web.bind.annotation.RestController; @@ -33,6 +34,8 @@ @AllArgsConstructor @Slf4j public class MdmInterJtClient implements IMdmInterJtClient { + @Value("${docking.apply.partCoe:10}") + public String partCoe; /** * 闆嗗洟鐢宠鍗曟湇鍔� */ @@ -89,9 +92,6 @@ return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage()); } } - - - /* * 涓绘暟鎹笟鍔℃湇鍔� */ @@ -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(); @@ -165,20 +165,26 @@ String jdataid = dockingPreApplyForm.getDataOid(); String jdatabtmname = dockingPreApplyForm.getDataBtmName(); if (res) { - //姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀� BaseModel baseModel = new BaseModel(); - baseModel.setId(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