From 8381325223bee254168855b1b697db31fc591b9e Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 19 九月 2023 09:28:42 +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 | 36 +++++++++++++++++++++++++-----------
1 files changed, 25 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 113b4af..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
@@ -7,6 +7,7 @@
import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
import com.vci.ubcs.code.applyjtcodeservice.service.*;
import com.vci.ubcs.code.applyjtcodeservice.vo.*;
+import com.vci.ubcs.code.feign.IMdmEngineClient;
import com.vci.ubcs.starter.revision.model.BaseModel;
import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
@@ -14,6 +15,8 @@
import lombok.extern.slf4j.Slf4j;
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;
@@ -31,6 +34,8 @@
@AllArgsConstructor
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
+ @Value("${docking.apply.partCoe:10}")
+ public String partCoe;
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
*/
@@ -62,7 +67,8 @@
*/
private final IGroupMdmInterService groupMdmInterService;
-
+ @Autowired(required = false)
+ private IMdmEngineClient mdmEngineClient;
/***
* 鐢宠闆嗗洟缂栫爜
* @return
@@ -81,14 +87,11 @@
@Override
public R receiveEditApply(String oids, String btmName) {
try {
- return groupMdmInterService.applyGroupCode(oids,btmName);
+ return groupMdmInterService.receiveEditApply(oids,btmName);
}catch (Throwable e){
return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
}
}
-
-
-
/*
* 涓绘暟鎹笟鍔℃湇鍔�
*/
@@ -103,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();
@@ -159,18 +162,29 @@
//杩斿洖缁撴灉淇℃伅
dockingPreApplyForm.setContent(jcontent.toJSONString());
dockingPreApplyFormList.add(dockingPreApplyForm);
+ String jdataid = dockingPreApplyForm.getDataOid();
+ String jdatabtmname = dockingPreApplyForm.getDataBtmName();
if (res) {
- String jdataid = dockingPreApplyForm.getDataOid();
- String jdatabtmname = dockingPreApplyForm.getDataBtmName();
//姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀�
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);
+
}
}
+ if(!CollectionUtils.isEmpty(editObjectMap)) {
+ //璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
+ editObjectMap.forEach((btmName, modeList) -> {
+ mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
+ });
+ }
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
- //璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
}catch (Throwable e){
e.printStackTrace();
return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
--
Gitblit v1.9.3