From 5f0d9a00a1e0f27c2f8396dcd98fac5022aa40c7 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期六, 13 四月 2024 20:48:04 +0800
Subject: [PATCH] 内网开发环境代码合并
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 5 ++---
1 files changed, 2 insertions(+), 3 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 7ba6101..bc5298e 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
@@ -28,7 +28,6 @@
import org.springframework.web.bind.annotation.RestController;
import springfox.documentation.annotations.ApiIgnore;
-import javax.servlet.http.HttpServletRequest;
import java.util.*;
import java.util.stream.Collectors;
@@ -136,7 +135,6 @@
log.info("鑾峰彇闆嗗洟闆嗗洟鐮侊紝璧嬪�煎埌涓绘暟鎹� start");
try {
Map<String,List<BaseModel>> editObjectMap = new HashMap<>();
-
List<DockingPreApplyForm> dockingPreApplyFormList = new ArrayList();
//String classId = javaObject.getClassId();
//String sysName = javaObject.getSysName();
@@ -173,6 +171,7 @@
} else if ("9".equals(formState)) {
msg = "瀹℃牳涓�";
}
+ // 濡傛灉杩斿洖浜嗗鏌ユ剰瑙佸氨鐢ㄨ繑鍥炵殑
msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"锛屾剰瑙侊細"+mainData.getExamineOpinion():msg;
jcontent.put("applyId", applyId);
jcontent.put("formState", formState);
@@ -225,7 +224,7 @@
if(!CollectionUtils.isEmpty(dockingPreApplyFormList)){
dockingPreApplyFormService.saveOrUpdateBatch(dockingPreApplyFormList);
}
- saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false,JSON.toJSONString(dockingReturnStoreVO.getMainData()));
+ saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",false, JSON.toJSONString(dockingReturnStoreVO.getMainData()));
}catch (Throwable e){
e.printStackTrace();
saveLogUtil.operateLog("鐢宠鍗曠粨鏋滆繑鍥�",true,"閿欒淇℃伅锛�"+e.getMessage()+"\n"+ JSON.toJSONString(dockingReturnStoreVO.getMainData()));
--
Gitblit v1.9.3