From b3123380397990c9a82710dad430f87fb97b4b8f Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 15 四月 2024 11:51:39 +0800
Subject: [PATCH] 内网开发环境代码合并
---
Source/UBCS/ubcs-service/ubcs-applyjtcodeservice/src/main/java/com/vci/ubcs/code/applyjtcodeservice/feigh/MdmInterJtClient.java | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 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 51b5770..c456a78 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
@@ -41,8 +41,8 @@
@Slf4j
public class MdmInterJtClient implements IMdmInterJtClient {
- @Value("${docking.apply.partCoe:10}")
- public String partCoe;
+ @Value("${docking.apply.partCode:10}")
+ public String partCode;
/**
* 闆嗗洟鐢宠鍗曟湇鍔�
@@ -135,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();
@@ -172,7 +171,8 @@
} else if ("9".equals(formState)) {
msg = "瀹℃牳涓�";
}
- msg = Func.isNotBlank(mainData.getExamineOpinion()) ? mainData.getExamineOpinion():msg;
+ // 濡傛灉杩斿洖浜嗗鏌ユ剰瑙佸氨鐢ㄨ繑鍥炵殑
+ msg = Func.isNotBlank(mainData.getExamineOpinion()) ? msg+"锛屾剰瑙侊細"+mainData.getExamineOpinion():msg;
jcontent.put("applyId", applyId);
jcontent.put("formState", formState);
jcontent.put("customCoding", customCoding);
@@ -185,6 +185,7 @@
DockingPreApplyForm dockingPreApplyForm = oldDockingPreApplyFormList.get(0);
dockingPreApplyForm.setMsg(msg);
dockingPreApplyForm.setCode("1");
+ dockingPreApplyForm.setLastModifyTime(new Date());
if (res) {
dockingPreApplyForm.setGroupCode(customCoding);
}
@@ -223,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()));
@@ -317,8 +318,8 @@
try {
String jclassId =StringUtils.isBlank(jclassObject.getId())?"":jclassObject.getId();
Map<String, DockingPreViewModel> jviewmodelMap = new HashMap<String, DockingPreViewModel>();
- //Map<String, String> condtionMa = new HashMap<String, String>();
- // condtionMa.put("jsourceclsfid", jclassId);
+ // Map<String, String> condtionMa = new HashMap<String, String>();
+ // condtionMa.put("jsourceclsfid", jclassId);
List<DockingPreViewModel> dockingPreViewModelList= dockingPreViewModelService.list(Wrappers.<DockingPreViewModel>query().lambda().eq(DockingPreViewModel::getSourceClassifyId,false));// 鏍规嵁鍒嗙被鏌ヨ妯″瀷瑙嗗浘瀵硅薄
for (DockingPreViewModel dockingPreViewModel : dockingPreViewModelList) {
jviewmodelMap.put(dockingPreViewModel.getViewName(),dockingPreViewModel);
--
Gitblit v1.9.3