From 4ed0e9d8ed0e785e62c0f9deb299445e5947c364 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 14 九月 2023 15:43:42 +0800
Subject: [PATCH] PDM 集团码提示信息bug修改
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 50 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 44 insertions(+), 6 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 820abb3..49df7b6 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,14 +7,15 @@
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;
-import com.vci.ubcs.starter.web.constant.MdmEnumIdConstant;
import lombok.AllArgsConstructor;
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.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.RestController;
@@ -48,15 +49,47 @@
private final IDockingPreMetaAttrService dockingPreMetaAttrService;
/**
- * 闆嗗洟鐢宠鍗曟湇鍔�
+ * 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔�
*/
private final IDockingPreClassifyService dockingPreClassifyService;
/**
- * 闆嗗洟鐢宠鍗曟湇鍔�
+ * 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟
*/
private final IDockingPreAttrRangeService dockingPreAttrRangeService;
+
+ /**
+ * 闆嗗洟灞炴�ф槧灏勯厤缃睘鎬�
+ */
+ private final IGroupMdmInterService groupMdmInterService;
+
+ @Autowired(required = false)
+ private IMdmEngineClient mdmEngineClient;
+ /***
+ * 鐢宠闆嗗洟缂栫爜
+ * @return
+ */
+ public R applyGroupCode(String oids,String btmName){
+ try {
+ return groupMdmInterService.applyGroupCode(oids,btmName);
+ }catch (Throwable e){
+ return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
+ }
+ }
+ /***
+ * 鐢宠闆嗗洟缂栫爜鏁版嵁缁存姢
+ * @return
+ */
+ @Override
+ public R receiveEditApply(String oids, String btmName) {
+ try {
+ return groupMdmInterService.receiveEditApply(oids,btmName);
+ }catch (Throwable e){
+ return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
+ }
+ }
+
/*
@@ -129,18 +162,23 @@
//杩斿洖缁撴灉淇℃伅
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);
log.info("鐢宠鍗�:"+applyId+",闆嗗洟鐮侊細"+customCoding+"缂栫爜锛�"+baseModel.getId());
editObjectList.add(baseModel);
}
+ List<String> dataOidList=new ArrayList<>();
+ dataOidList.add(jdataid);
+ //璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
+ mdmEngineClient.updateBatchByType(jdatabtmname,editObjectList);
}
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
- //璋冪敤涓绘暟鎹湇鍔℃壒閲忎繚瀛樻帴鍙�
+
}catch (Throwable e){
e.printStackTrace();
return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
--
Gitblit v1.9.3