From 41021633bfee5b5c9c57cb888423f3392c530f98 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 三月 2024 18:31:08 +0800
Subject: [PATCH] 业务类型bug修改,集成接口,远程部署等功能修改。

---
 Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java |   16 ++++++++++------
 1 files changed, 10 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 344f981..51b5770 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
@@ -1,6 +1,7 @@
 package com.vci.ubcs.code.applyjtcodeservice.feigh;
 
 import com.alibaba.cloud.commons.lang.StringUtils;
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alibaba.nacos.shaded.com.google.protobuf.ServiceException;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -12,12 +13,14 @@
 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.util.SaveLogUtil;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.extern.slf4j.Slf4j;
 import org.jetbrains.annotations.NotNull;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
+import org.springblade.core.tool.utils.Func;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.transaction.annotation.Transactional;
@@ -79,6 +82,8 @@
 	@Autowired(required = false)
 	private IMdmEngineClient mdmEngineClient;
 
+	private final SaveLogUtil saveLogUtil;
+
 	/***
 	 * 鐢宠闆嗗洟缂栫爜
 	 * @return
@@ -119,9 +124,6 @@
 		}
 	}
 
-	/*
-	 * 涓绘暟鎹笟鍔℃湇鍔�
-	 */
 	/**
 	 * 鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹�
 	 * @param dockingReturnStoreVO
@@ -170,6 +172,7 @@
 				} else if ("9".equals(formState)) {
 					msg = "瀹℃牳涓�";
 				}
+				msg = Func.isNotBlank(mainData.getExamineOpinion()) ? mainData.getExamineOpinion():msg;
 				jcontent.put("applyId", applyId);
 				jcontent.put("formState", formState);
 				jcontent.put("customCoding", customCoding);
@@ -220,9 +223,11 @@
 			if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
 				dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
 			}
+			saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
 		}catch (Throwable e){
 			e.printStackTrace();
-			 return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
+			saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",true,"閿欒淇℃伅锛�"+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
+			return R.fail("闆嗗洟鐮侀泦鎴愯祴鍊煎け璐ワ紝鍘熷洜锛�"+e.getMessage());
 		}
 		log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� end");
 		return R.success("闆嗗洟鐮佽祴鍊兼垚鍔�");
@@ -307,8 +312,7 @@
 	 * @param jclassObject
 	 * @throws Throwable
 	 */
-	private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list)
-		throws Throwable {
+	private void getVilewMode(@NotNull DockingClassifyVO jclassObject, List<DockingClassifyViewVO> list) throws Throwable {
 		String nodeLinkName = jclassObject.getNodeLinkName();
 		try {
 			String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId();

--
Gitblit v1.9.3