From 5fb0afaeae8f7235e0a4c6e47a31123383dd5695 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 30 十月 2023 13:47:01 +0800
Subject: [PATCH] 前端增加码段类型枚举类，实现修改码段类型时提供是否清空码值对话框功能
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java | 21 +++++++++++----------
1 files changed, 11 insertions(+), 10 deletions(-)
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 3385b48..68a43ff 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
@@ -382,6 +382,7 @@
}
codeAllCodeService.updateBatchById(codeCbos);
}
+
/**
* 鐢宠鍗曚竴缂栫爜
*
@@ -390,7 +391,7 @@
*/
@Override
public String addSaveCode(CodeOrderDTO orderDTO) throws Exception {
- return addSaveCode(orderDTO,true);
+ return addSaveCode(orderDTO,true);
}
/***
@@ -403,6 +404,7 @@
public String addSaveCodeNotauthUser(CodeOrderDTO orderDTO, boolean authUser) throws Exception {
return addSaveCode(orderDTO,authUser);
}
+
/**
* 鐢宠鍗曚竴缂栫爜
*
@@ -434,8 +436,8 @@
//9.鐢熸垚缂栫爜鐨勪俊鎭�
// ClientBusinessObject cbo = boService.createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmtypeid());
BaseModel cbo = createCBOByBtmName(classifyFullInfo.getTopClassifyVO().getBtmTypeId());
-// //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
-// //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
+ //榛樿鐨勫睘鎬ч兘涓嶇敤浠庡墠绔嫹璐�
+ //璁剧疆缂栫爜闇�瑕佺殑榛樿灞炴�х殑鍐呭
copyValueToCBO(classifyFullInfo, cbo, orderDTO, templateVO, false);
cbo.setOid(VciBaseUtil.getPk());
cbo.setRevisionOid(VciBaseUtil.getPk());
@@ -455,9 +457,9 @@
if(StringUtils.isNotBlank(orderDTO.getLcStatus())||StringUtils.isNotBlank(orderDTO.getData().get("lcStatus"))){
cbo.setLcStatus(StringUtils.isNotBlank(orderDTO.getLcStatus())?orderDTO.getLcStatus():orderDTO.getData().get("lcStatus"));
}
-// //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
+ //TODO:鍥犱负榛樿鐨勫睘鎬ч兘涓嶆嫹璐濓紝鐩墠闆嗗洟鐮佸彨name锛屽苟娌℃湁浠嶥TO鎷疯礉鍒癱bo閲屻�傚鍔犱竴涓崟鐙鐞嗭紝浠ュ悗鍐嶇湅瑕佷笉瑕佽皟鏁�
cbo.setName(orderDTO.getName() == null ? "" : orderDTO.getName());
-// //end -- modify by lihang @20220407
+ //end -- modify by lihang @20220407
List<BaseModel> cboList = new ArrayList<>();
//澶囨敞
@@ -513,7 +515,6 @@
});
}
}
-
/**
* 鍒ゆ柇缂栫爜鐨勭爜娈垫槸鍚﹁緭鍏ユ垨鑰呴�夋嫨浜嗙爜鍊�
@@ -1018,22 +1019,22 @@
List<CodeClassifyTemplateAttrVO> selectAttrVOs = templateVO.getAttributes().stream().filter(s -> StringUtils.isNotBlank(s.getLibraryIdentification())).collect(Collectors.toList());
if (!CollectionUtils.isEmpty(selectAttrVOs)) {
-// SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
+ //SessionInfo sessionInfo = VciBaseUtil.getCurrentUserSessionInfo();
selectAttrVOs.parallelStream().forEach(attrVO -> {
List<String> valuesList = new ArrayList<>();
cboList.parallelStream().forEach(cbo -> {
-// String value = cbo.get.getAttributeValue(attrVO.getId());
+ //String value = cbo.get.getAttributeValue(attrVO.getId());
//灏哹ean杞负map,mybatis缁熶竴澶勭悊
Map<String, String> map = null;
-// baseModels.stream().forEach(model-> {
+ //baseModels.stream().forEach(model-> {
try {
map = VciBaseUtil.convertBean2Map(cbo,null);
} catch (Exception e) {
throw new VciBaseException("绫诲瀷杞崲閿欒锛�" + e.getMessage());
}
-// });
+ //});
String value = map.get(attrVO.getId());
if (StringUtils.isNotBlank(value)) {
--
Gitblit v1.9.3