From 309de8506f5e08dea1c8fdd0d377f0884aa21dd7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 18 三月 2024 18:21:39 +0800
Subject: [PATCH] 集成相关更改

---
 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreApplyForm.java       |    7 +++
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java |   21 +++-------
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java                                       |    2 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java                                            |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java                                    |    4 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java                                                     |    3 +
 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java          |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java                                         |    3 +
 Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/MdmApplyGroupCodeProvider.java  |    2 +
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/impl/GroupMdmInterServiceImpl.java    |   27 +++++++------
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java                   |   17 ++++++--
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupMdmInterService.java            |    5 +-
 12 files changed, 56 insertions(+), 38 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreApplyForm.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreApplyForm.java
index 53f7bed..c7af4e3 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreApplyForm.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/entity/DockingPreApplyForm.java
@@ -17,11 +17,13 @@
 @ApiModel(value = "DockingPreApplyForm", description = "闆嗗洟缂栫爜鐢宠鍗曡褰曞璞�")
 @EqualsAndHashCode
 public class DockingPreApplyForm extends BaseModel {
+
 	/***
 	 * 闆嗗洟缂栫爜
 	 */
 	@ApiModelProperty(value = "闆嗗洟缂栫爜")
 	private String groupCode;
+
 	/***
 	 * 閿欒鏍囪瘑鐮�
 	 */
@@ -33,24 +35,29 @@
 	 */
 	@ApiModelProperty(value = "鍐呭")
 	private String content;
+
 	/***
 	 *涓婚敭oid
 	 */
 	@ApiModelProperty(value = "鏁版嵁涓婚敭")
 	private String dataOid;
+
 	/**
 	 * 涓氬姟瀵硅薄
 	 */
 	@ApiModelProperty(value = "涓氬姟瀵硅薄")
 	private String dataBtmName;
+
 	/***
 	 * 娑堟伅
 	 */
 	@ApiModelProperty(value = "娑堟伅")
 	private String msg;
+
 	/**
 	 * 鐢宠鍗曠被鍨�1:鐢宠锛�2锛氭洿鏀�
 	 */
 	@ApiModelProperty(value = "娑堟伅")
 	private  String operationType;
+
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
index 41c3786..ed8224f 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/IMdmInterJtClient.java
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.applyjtcodeservice.feign;
 
 
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingClassifyModelAttrVO;
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.applyjtcodeservice.vo.DockingReturnStoreVO;
diff --git a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/MdmApplyGroupCodeProvider.java b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/MdmApplyGroupCodeProvider.java
index 2570c9a..2ad128d 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/MdmApplyGroupCodeProvider.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-applyjtcodeservice-api/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feign/MdmApplyGroupCodeProvider.java
@@ -30,6 +30,7 @@
 	 */
 	@PostMapping("/externalMainData/receiveAddApply")
 	DockingResultVO receiveAddApply(@NotNull @RequestBody DockingGroupDataVO dockingGroupDataVO)throws VciBaseException;
+
 	/**
 	 * mdm鍚戦泦鍥㈡洿鏂伴泦鍥㈢爜鎺ュ彛
 	 * @param dockingGroupDataVO AO/TO鐨勪俊鎭�
@@ -53,6 +54,7 @@
 	 */
 	@PostMapping("/externalMainData/queryClassModel")
 	DockingQueryClassModelVO queryClassModel(@NotNull @RequestBody DockingModelQueryVO dockingModelQueryVO);
+
 	/***
 	 * 鏌ヨ鐢宠鍗曠姸鎬�
 	 * @param dockingModelQueryVO
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java
index b0c98df..8e018d8 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/feign/IMdmEngineClient.java
@@ -51,7 +51,6 @@
     @GetMapping(SELECT_BY_TYPE_OID)
 	R<List<BaseModel>> selectByTypeAndOid(@RequestParam("btmType") String btmType, @RequestParam("oids") String oids);
 
-
 	/**
 	 * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩稿叧鏁版嵁杩涜鎵归噺鎻掑叆鎿嶄綔
 	 *
@@ -71,4 +70,5 @@
 	 */
 	@PostMapping(UPDATE_BATCH_BY_TYPE)
 	R<Integer>updateBatchBtypeDatas(@RequestParam("btmType")String btmType,@RequestBody List<BaseModel> baseModels);
+
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
index 5da8b84..a9ea031 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/controller/DockingPreApplyCodeController.java
@@ -48,32 +48,26 @@
 	/***
 	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
 	 */
-
 	private final IDockingPreAttrRangeService dockingPreAttrRangeService;
 
 	/***
 	 * 鍒嗙被灞炴�ф灇涓捐寖鍥存湇鍔�
 	 */
-
 	private final IDockingPreClassifyService dockingPreClassifyService;
 
 	/***
 	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
 	 */
-
 	private final IDockingPreApplyFormService dockingPreApplyFormService;
 
 	/***
 	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
 	 */
-
 	private final IDockingPreViewModelService dockingPreViewModelService;
-
 
 	/***
 	 * 灞炴�ф灇涓捐寖鍥存湇鍔�
 	 */
-
 	private final ICodeClassifyClient codeClassifyClient;
 
 	/**
@@ -132,7 +126,6 @@
 		return R.data(dockingPreAttrRangeVOS);
 	}
 
-
 	/**
 	 * 鍙傜収鏍� 闆嗗洟鍒嗙被锛堟槸鍚﹀寘鍚睘鎬э級
 	 * @param treeQueryObject 鏍戝舰鏌ヨ瀵硅薄 conditionMap 瀛樹笂 codeclsfid=涓绘暟鎹殑鍒嗙被oid
@@ -142,7 +135,6 @@
 	public List<Tree> referTree(TreeQueryObject treeQueryObject)  {
 		return dockingPreClassifyService.treeCompanyGroupClassify(treeQueryObject);
 	}
-
 
 	/**
 	 * 鍙傜収鏍� 涓绘暟鎹ā鏉垮睘鎬т俊鎭�
@@ -174,7 +166,6 @@
 		return R.data(codeClassifyClient.listCodeAttributeByClassId(codeClassifyId));
 	}
 
-
 	/***
 	 * 鐢宠闆嗗洟缂栫爜
 	 * @return
@@ -183,13 +174,13 @@
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "闆嗗洟鐮佺敵璇�", notes = "dockingPreAttrMappingVOList")
 	public R applyGroupCode(String oids,String btmName){
-		List<BaseModelVO> BaseModelVOS=new ArrayList<>();
 		try {
 			return groupMdmInterService.applyGroupCode(oids,btmName);
 		}catch (Throwable e){
 			return R.fail("闆嗗洟鐮佺敵璇峰け璐ワ細"+e.getMessage());
 		}
 	}
+
 	/***
 	 * 鏇存柊闆嗗洟缂栫爜鏁版嵁
 	 * @return
@@ -222,11 +213,11 @@
 
 	}
 
-/***
- * 鏌ヨ鐢宠鍗曠姸鎬�
- * oids:涓氬姟鏁版嵁oid
- * @return 杩斿洖鎵ц缁撴灉淇℃伅
- */
+	/***
+	 * 鏌ヨ鐢宠鍗曠姸鎬�
+	 * oids:涓氬姟鏁版嵁oid
+	 * @return 杩斿洖鎵ц缁撴灉淇℃伅
+	 */
 	@GetMapping( "/queryApplyState")
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "鏌ョ湅鐢宠鍗曠姸鎬�", notes = "鏌ョ湅鐢宠鍗曠姸鎬�")
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 efecb25..344f981 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
@@ -2,6 +2,7 @@
 
 import com.alibaba.cloud.commons.lang.StringUtils;
 import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.vci.ubcs.code.applyjtcodeservice.entity.*;
 import com.vci.ubcs.code.applyjtcodeservice.feign.IMdmInterJtClient;
@@ -36,8 +37,10 @@
 @Data
 @Slf4j
 public class MdmInterJtClient implements IMdmInterJtClient {
+
 	@Value("${docking.apply.partCoe:10}")
 	public String partCoe;
+
 	/**
 	 * 闆嗗洟鐢宠鍗曟湇鍔�
 	 */
@@ -57,10 +60,12 @@
 	 * 闆嗗洟鍒嗙被鐢宠鍗曟湇鍔�
 	 */
 	private final IDockingPreClassifyService dockingPreClassifyService;
+
 	/***
 	 * 灞炴�ф槧灏勬湇鍔�
 	 */
 	private final IDockingPreAttrMappingService dockingPreAttrMappingService;
+
 	/**
 	 * 闆嗗洟鍙栧�艰寖鍥寸敵璇峰崟鏈嶅姟
 	 */
@@ -73,6 +78,7 @@
 
 	@Autowired(required = false)
 	private IMdmEngineClient mdmEngineClient;
+
 	/***
 	 * 鐢宠闆嗗洟缂栫爜
 	 * @return
@@ -112,6 +118,7 @@
 			return R.fail("闆嗗洟鐮佹暟鎹慨鏀瑰け璐ワ細"+e.getMessage());
 		}
 	}
+
 	/*
 	 * 涓绘暟鎹笟鍔℃湇鍔�
 	 */
@@ -185,7 +192,7 @@
 				String jdatabtmname = dockingPreApplyForm.getDataBtmName();
 				if (res) {
 					//姝ゅ闇�瑕佹煡璇笟鍔℃暟鎹紝鍘绘洿鏀�
-					R<List<BaseModel>>  R=mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid);
+					R<List<BaseModel>> R = mdmEngineClient.selectByTypeAndOid(jdatabtmname,jdataid);
 					if(R.isSuccess()){
 						List<BaseModel> oldDatalist=new ArrayList<>();
 						List<BaseModel> newDatalist=R.getData();
@@ -210,10 +217,12 @@
 					mdmEngineClient.updateBatchBtypeDatas(btmName, modeList);
 				});
 			}
-			dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+			if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
+				dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+			}
 		}catch (Throwable e){
 			e.printStackTrace();
-			return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐�"+e);
+			 return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
 		}
 		log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� end");
 		return R.success("闆嗗洟鐮佽祴鍊兼垚鍔�");
@@ -291,6 +300,7 @@
 			throw new Throwable("瀛樺偍瑙嗗浘妯″瀷鍑虹幇闂");
 		}
 	}
+
 	/***
 	 * 鑾峰彇鍒嗙被瑙嗗浘
 	 *
@@ -346,7 +356,6 @@
 			throw new Throwable("缁勭粐鍒嗙被" + nodeLinkName + "妯″瀷瑙嗗浘瀛樺偍鍑虹幇闂");
 		}
 	}
-
 
 	/***
 	 * 鑾峰彇妯″瀷瑙嗗浘灞炴��
diff --git a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupMdmInterService.java b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupMdmInterService.java
index 05f1edf..15a7626 100644
--- a/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupMdmInterService.java
+++ b/Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/service/IGroupMdmInterService.java
@@ -9,6 +9,7 @@
  * @author xiejun
  */
 public interface IGroupMdmInterService {
+
 	/***
 	 * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
 	 * @param oids
@@ -25,7 +26,6 @@
 	 * @return 杩斿洖缁撴灉淇℃伅
 	 * @throws Throwable
 	 */
-
 	public R receiveEditApply(String oids, String btmName)throws Throwable;
 
 	/***
@@ -36,13 +36,13 @@
 	 */
 	public R queryClassModel(String jtclsfId)throws Throwable;
 
-
 	/***
 	 * 鏌ヨ鍒嗙被璇︾粏妯″瀷瑙嗗浘
 	 * @return 杩斿洖缁撴灉淇℃伅
 	 * @throws Throwable
 	 */
 	public R queryMdmModel()throws Throwable;
+
 	/***
 	 *鍚屾闆嗗洟妯″瀷瑙嗗浘
 	 * @param classifyId
@@ -58,4 +58,5 @@
 	 * @throws VciBaseException
 	 */
 	R queryApplyState(String oids)throws VciBaseException;
+
 }
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 98ed589..c22e677 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
@@ -48,10 +48,13 @@
 	private String code="";
 
 	private String msg="";
+
 	@Value("${docking.apply.partCode:101}")
 	public String partCoe;
+
 	@Value("${docking.apply.usedFlag:false}")
 	public boolean usedFlag;
+
 	@Value("${docking.apply.unitCode:4100}")
 	public String dockingApplyUnitCode;
 
@@ -60,6 +63,7 @@
 
 	@Autowired(required = false)
 	private MdmApplyGroupCodeProvider mdmApplyGroupCodeProvider;
+
 	/***
 	 * 闆嗗洟鍒嗙被鏈嶅姟
 	 */
@@ -72,13 +76,11 @@
 	@Autowired(required = false)
 	private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreApplyFormService dockingPreApplyFormService;
 
-
 	/***
 	 * 妯″瀷瑙嗗浘鍗曟湇鍔�
 	 */
 	@Autowired(required = false)
 	private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreViewModelService dockingPreViewModelService;
-
 
 	/***
 	 * 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
@@ -91,7 +93,6 @@
 	@Autowired(required = false)
 	private com.vci.ubcs.code.applyjtcodeservice.service.IDockingPreAttrRangeService dockingPreAttrRangeService;
 
-
 	/***
 	 * 闆嗗洟灞炴�ф湇鍔�
 	 */
@@ -100,8 +101,9 @@
 
 	@Autowired(required = false)
 	private IMdmEngineClient mdmEngineClient;
+
 	/***
-	 * 涓绘暟鎹儚闆嗗洟鐢宠缂栫爜
+	 * 涓绘暟鎹悜闆嗗洟鐢宠缂栫爜
 	 * @param oids 闇�瑕佺敵璇风殑鏁版嵁涓婚敭鏁扮粍
 	 * @param btmName 涓氬姟绫诲瀷
 	 * @return 杩斿洖缁撴灉淇℃伅
@@ -137,8 +139,8 @@
 					Object object = JSONObject.toJSON(dockingGroupDataVO);
 					String resultStr = object.toString();
 					log.info("鐢宠闆嗗洟鐮佹暟鎹牸寮�:->"+resultStr);
-					DockingResultVO resultDataObject =new DockingResultVO();
-					resultDataObject=	mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
+					DockingResultVO resultDataObject = new DockingResultVO();
+					resultDataObject = mdmApplyGroupCodeProvider.receiveAddApply(dockingGroupDataVO);
 					code = resultDataObject.getCode();
 					msg = resultDataObject.getMsg();
 					boolean res=false;
@@ -253,6 +255,7 @@
 			return R.fail("鐢宠鎺ュ彛寮�鍏冲凡鍏抽棴锛屼笉鐢宠闆嗗洟鐮�");
 		}
 	}
+
 	/***
 	 * 涓绘暟鎹儚闆嗗洟鏇存敼缂栫爜
 	 * @param oids 闇�瑕佷慨鏀圭殑鏁版嵁涓婚敭鏁扮粍
@@ -526,8 +529,6 @@
 		return R.success(message);
 	}
 
-
-
 	/***
 	 * 鏌ヨ鐢宠鍗曠姸鎬�
 	 * @param dataOids
@@ -540,7 +541,7 @@
 			return R.fail("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙ｅ紑鍏冲凡鍏抽棴");
 		}
 		String message="鎵ц鎴愬姛锛�";
-		log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tatr");
+		log.info("鏌ヨ鐢宠鍗曠姸鎬佹帴鍙tart");
 		try {
 			VciBaseUtil.alertNotNull(dataOids,"鎵�鏌ョ敵璇峰崟鏁版嵁涓婚敭");
 			VciBaseUtil.alertNotNull(dockingApplySysName,"绯荤粺鏍囪瘑閰嶇疆锛歞ocking.apply.unitCode");
@@ -555,7 +556,7 @@
 			DockingModelQueryVO dockingModelQueryVO=new DockingModelQueryVO();
 			dockingModelQueryVO.setApplyNums(VciBaseUtil.array2String(applyIdList.toArray(new String[]{})));
 			dockingModelQueryVO.setSysName(dockingApplySysName);
-			DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO=mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
+			DockingApplyFormQueryStatusVO dockingApplyFormQueryStatusVO = mdmApplyGroupCodeProvider.queryApplyState(dockingModelQueryVO);
 
 			int code=dockingApplyFormQueryStatusVO.getCode();
 			String mesg=dockingApplyFormQueryStatusVO.getMsg();
@@ -573,7 +574,7 @@
 							applyFormObject.setMsg(jmsg);
 						}
 					}
-					boolean res=this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
+					boolean res =  this.dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
 				}else{
 					throw new Throwable("娌℃湁鑾峰彇鍒扮浉鍏虫暟鎹俊鎭�");
 				}
@@ -736,7 +737,6 @@
 			throw new Throwable("缁勭粐鍒嗙被" + nodeLinkName + "妯″瀷瑙嗗浘瀛樺偍鍑虹幇闂");
 		}
 	}
-
 
 	/***
 	 * 鑾峰彇妯″瀷瑙嗗浘灞炴��
@@ -1028,6 +1028,7 @@
 	 * 鑾峰彇灞炴�ф灇涓炬槧灏勯厤缃�
 	 */
 	Map<String,Map<String, DockingPreAttrRange>> attrRangeMap=new HashMap<String, Map<String,DockingPreAttrRange>>();
+
 	private void getAttrRange(DockingPreMetaAttr jmetaatter) throws Throwable{
 
 		String jmetalistoid = jmetaatter.getOid();
@@ -1045,6 +1046,7 @@
 		attrRangeMap.put(jmetalistoid, rangeMap);
 
 	}
+
 	/****
 	 * 鍊肩被鍨嬭浆鎹�
 	 * @param jmetaatter
@@ -1130,4 +1132,5 @@
 		}
 		return msg;
 	}
+
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
index 4c0649e..7e508cd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeSyncUniversalController.java
@@ -163,8 +163,8 @@
 	 * @throws Throwable
 	 */
 	@PostMapping("/syncDataForPerson")
-	public ResultOrgData syncDataForPerson(@RequestBody PersonData personData){
-
+	public ResultOrgData syncDataForPerson(@RequestBody PersonData personData,HttpServletRequest request){
+		this.setHttpToThreadLocal(request);
 		ResultOrgData result = new ResultOrgData();
 		try {
 			result= universalInterfaceI.syncDataForPerson(personData);
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java
index 761211d..4303ff4 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/feign/MdmEngineClient.java
@@ -44,7 +44,9 @@
 @RestController
 @AllArgsConstructor
 public class MdmEngineClient implements IMdmEngineClient {
+
 	private final MdmEngineService mdmEngineService;
+
 	/**
 	 * 浼犲叆涓氬姟绫诲瀷浠ュ強鐩竜id闆嗗悎鏌ヨ鏁版嵁杩涜杩斿洖
 	 *
@@ -78,6 +80,7 @@
 			throw new RuntimeException(e);
 		}
 	}
+
 	/**
 	 * 鏇存柊涓氬姟鏁版嵁鍚屾椂瀵圭爜鍊艰〃鏁版嵁鎿嶄綔鎺ュ彛
 	 *
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
index 6e778e8..6e1dacc 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java
@@ -258,8 +258,9 @@
 	 */
 	@Autowired
 	private ICodeRuleService ruleService;
+
 	/**
-	 * 缂栫爜瑙勫垯鐨勬湇鍔�
+	 * 鐮佸�肩殑鏈嶅姟
 	 */
 	@Autowired
 	private ICodeAllCodeService codeAllCodeService;
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 2af4b6c..0fc616d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -578,7 +578,7 @@
 				ApplyDatasVO applyDatasVO=new ApplyDatasVO();
 				ApplyDatasVO editDatasVO=new ApplyDatasVO();
 				if(!CollectionUtils.isEmpty(cboList)){
-				Map<String,ClientBusinessObject> oldpplyDataVOMap=	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
+				Map<String,ClientBusinessObject> oldpplyDataVOMap =	cboList.stream().filter(data -> data != null && StringUtils.isNotBlank(data.getId())).collect(Collectors.toList()).stream().collect(Collectors.toMap(s -> s.getId().toLowerCase(Locale.ROOT), t -> t));
 					//鏁版嵁搴撲笉瀛樺湪鐨�
 					List<ApplyDataVO> applyApplyDataVOList = applyDataVOList.stream().filter(cbo -> {
 						String code =cbo.getCode();

--
Gitblit v1.9.3