From 3729193aff63c48527cfde4467a9fc020100ae37 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 05 十二月 2023 19:08:03 +0800
Subject: [PATCH] 代码提交

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java |   54 +++++++++++++++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 15 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..42e4177 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
@@ -12,10 +12,12 @@
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
 import lombok.AllArgsConstructor;
+import lombok.Data;
 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;
@@ -30,9 +32,11 @@
 @NonDS
 @ApiIgnore
 @RestController
-@AllArgsConstructor
+@Data
 @Slf4j
 public class MdmInterJtClient implements IMdmInterJtClient {
+	@Value("${docking.apply.partCoe:10}")
+	public String partCoe;
 	/**
 	 * 闆嗗洟鐢宠鍗曟湇鍔�
 	 */
@@ -52,8 +56,10 @@
 	 * 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔�
 	 */
 	private final IDockingPreClassifyService dockingPreClassifyService;
-
-
+	/***
+	 * 灞炴�ф槧灏勬湇鍔�
+	 */
+	private final IDockingPreAttrMappingService dockingPreAttrMappingService;
 	/**
 	 * 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟
 	 */
@@ -77,6 +83,22 @@
 			return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
 		}
 	}
+
+	/***
+	 * 鏌ヨ闆嗗洟灞炴�ф槧灏�
+	 * @param codeClassifyOid:缂栫爜鍒嗙被oid
+	 * @return
+	 */
+	@Override
+	public R<List<DockingPreAttrMappingVO>> list_mapping(String codeClassifyOid) {
+		List<DockingPreAttrMapping> dockingPreAttrMappings=	dockingPreAttrMappingService.selectByWrapper(Wrappers.<DockingPreAttrMapping>query().lambda().eq(DockingPreAttrMapping::getTargetClassifyId,codeClassifyOid));
+		List<DockingPreAttrMappingVO> dockingPreAttrMappingVOList=new ArrayList<>();
+		if(!CollectionUtils.isEmpty(dockingPreAttrMappings)){
+			dockingPreAttrMappingVOList=dockingPreAttrMappingService.dockingPreAttrMappingDO2VOS(dockingPreAttrMappings,true);
+		}
+		return R.data(dockingPreAttrMappingVOList);
+	}
+
 	/***
 	 * 鐢宠闆嗗洟缂栫爜鏁版嵁缁存姢
 	 * @return
@@ -89,13 +111,9 @@
 			return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
 		}
 	}
-
-
-
 	/*
 	 * 涓绘暟鎹笟鍔℃湇鍔�
 	 */
-
 	/**
 	 * 鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹�
 	 * @param dockingReturnStoreVO
@@ -106,7 +124,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 +183,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