From a2fa411f10fefa7d7186e5d20ffe928d4689c373 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 18 九月 2023 10:32:55 +0800
Subject: [PATCH] 申请集团码相关接口加上特殊取集团码的情况处理

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java |   18 +++++++++++++-----
 1 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
index ae69cc9..b0535f1 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java
@@ -9,6 +9,8 @@
 import com.vci.ubcs.code.applyjtcodeservice.entity.*;
 import com.vci.ubcs.code.applyjtcodeservice.service.IGroupMdmInterService;
 import com.vci.ubcs.code.applyjtcodeservice.vo.*;
+import com.vci.ubcs.code.vo.pagemodel.CodeClassifyTemplateAttrVO;
+import com.vci.ubcs.code.vo.webserviceModel.result.xml.XMLResultDataObjectDetailDO;
 import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
 import com.vci.ubcs.code.applyjtcodeservice.feign.MdmApplyGroupCodeProvider;
 import com.vci.ubcs.code.applyjtcodeservice.mapper.DockingPreAttrMappingMapper;
@@ -168,11 +170,14 @@
 							if (isEditDatas) {
 								if (baseModelMap.containsKey(applyId)) {
 									BaseModel baseModel = baseModelMap.get(applyId);
-									baseModel.getData().getOrDefault("codeclassid","");
+									String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+									if(partCoe.equals(classOid)){
+										baseModel.setId(10+customCoding);
+									}
 									BeanUtilForVCI.copyDeclaredIgnoreCase(baseModel, baseModel);
 									DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
 									DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
-									//baseModel.setId(customCoding);
+
 									baseModel.getData().getOrDefault("groupCode", customCoding);
 									updateCbos.add(baseModel);//鏇存柊鏁版嵁闆嗗洟code
 								}
@@ -202,7 +207,7 @@
 					}
 					//淇濆瓨琛ㄥ崟鏁版嵁
 					dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
-					mdmEngineClient.updateBatchByType(btmName, updateCbos);//淇濆瓨鏁版嵁
+					mdmEngineClient.updateBatchBtypeDatas(btmName, updateCbos);//淇濆瓨鏁版嵁
 				}
 				return R.success("鐢宠鎺ュ彛璋冪敤鎴愬姛");
 			} catch (VciBaseException e) {
@@ -212,7 +217,6 @@
 			return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
 		}
 	}
-
 	/***
 	 * 涓绘暟鎹儚闆嗗洟鏇存敼缂栫爜
 	 * @param oids 闇�瑕佷慨鏀圭殑鏁版嵁涓婚敭鏁扮粍
@@ -292,6 +296,10 @@
 							if (baseModelMap.containsKey(applyId)) {
 								BaseModel baseModel = baseModelMap.get(applyId);
 								//BeanUtilForVCI.copyDeclaredIgnoreCase(baseModelVO, baseModel);
+								String classOid=baseModel.getData().getOrDefault("CODECLSFID","");
+								if(partCoe.equals(classOid)){
+									baseModel.setId(10+customCoding);
+								}
 								DefaultAttrAssimtUtil.updateDefaultAttrAssimt(baseModel);
 								//	baseModel.setId(customCoding);
 								baseModel.getData().put("groupCode", customCoding);
@@ -323,7 +331,7 @@
 				}
 				//淇濆瓨琛ㄥ崟鏁版嵁
 				dockingPreApplyFormService.saveOrUpdateBatch(dockingPreAttrMappings);
-				mdmEngineClient.updateBatchByType(btmName, updateCbos);//淇濆瓨鏁版嵁
+				mdmEngineClient.updateBatchBtypeDatas(btmName, updateCbos);//淇濆瓨鏁版嵁
 			}
 			return R.success("鏇存柊鎺ュ彛璋冪敤鎴愬姛");
 		} catch (VciBaseException e) {

--
Gitblit v1.9.3