From 07d570d63420e1dca2760034fe6fe9c28810298b Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 05 十二月 2024 11:34:25 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java | 34 +++++++++++++++++-----------------
1 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
index 6c38eee..e5fc42b 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/uidataservice/impl/UIDataCommonServiceImpl.java
@@ -150,7 +150,7 @@
*/
@Override
public DataGrid getDataForGrid(UIDataGridQuery dataGridQuery) throws VciBaseException, PLException {
- VciBaseUtil.alertNotNull(dataGridQuery,"鏌ヨ瀵硅薄",dataGridQuery.getBtmname(),"涓氬姟绫诲瀷",dataGridQuery.getTableDefineId());
+ VciBaseUtil.alertNotNull(dataGridQuery,"鏌ヨ瀵硅薄",dataGridQuery.getBtmName(),"涓氬姟绫诲瀷",dataGridQuery.getTableDefineId());
// TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
if(Func.isNotEmpty(dataGridQuery.getSourceData())){
dataGridQuery.setSourceData(this.convertMapValueJson2Map(dataGridQuery.getSourceData()));
@@ -160,7 +160,7 @@
String queryTemplate = Func.isNotEmpty(dataGridQuery.getSourceData())? (String) dataGridQuery.getSourceData().getOrDefault("querytemplate",tableDefineVO.getQueryTemplateName()) :tableDefineVO.getQueryTemplateName();
if(StringUtils.isBlank(queryTemplate)){
//璇存槑娌℃湁璁剧疆鏌ヨ妯℃澘锛岄渶瑕佺湅鐪嬪湪杩欎釜琛ㄦ牸鎵�鍦ㄧ殑缁勪欢鏈夋病鏈夎缃�
- tableDefineVO = uiEngineService.getTableById(dataGridQuery.getBtmname(), dataGridQuery.getTableDefineId());
+ tableDefineVO = uiEngineService.getTableById(dataGridQuery.getBtmName(), dataGridQuery.getTableDefineId());
queryTemplate = tableDefineVO.getQueryTemplateName();
}
//鐪嬬湅鏈夋病鏈夎嚜瀹氫箟鐨凷QL
@@ -190,12 +190,12 @@
OsBtmTypeVO btmTypeVO = null;
OsLinkTypeVO linkTypeVO = null;
if(dataGridQuery.isLinkTypeFlag()){
- linkTypeVO = linkTypeService.getLinkTypeById(dataGridQuery.getBtmname());
+ linkTypeVO = linkTypeService.getLinkTypeById(dataGridQuery.getBtmName());
queryFieldList.addAll(linkTypeVO.getAttributes().stream().map(OsLinkTypeAttributeVO::getId).collect(Collectors.toList()));
queryFieldList.addAll(WebLoServiceImpl.LO_BASE_FIELD_MAP.values());
}else{
//btmTypeVO = btmService.getBtmById(dataGridQuery.getBtmname());
- btmTypeVO = btmService.getBtmByName(dataGridQuery.getBtmname());
+ btmTypeVO = btmService.getBtmByName(dataGridQuery.getBtmName());
queryFieldList.addAll(btmTypeVO.getAttributes().stream().map(OsBtmTypeAttributeVO::getId).collect(Collectors.toList()));
queryFieldList.addAll(WebBoServiceImpl.BO_BASE_FIELD_MAP.values());
}
@@ -210,7 +210,7 @@
linkTypeDataQuery.setReplaceMap(replaceMap);
linkTypeDataQuery.setConditionMap(dataGridQuery.getConditionMap());
linkTypeDataQuery.setClauseList(queryFieldList);
- linkTypeDataQuery.setLinkType(dataGridQuery.getBtmname());
+ linkTypeDataQuery.setLinkType(dataGridQuery.getBtmName());
if(dataGridQuery.isTreeTableFlag()){
linkTypeDataQuery.setLevel(-1);
}
@@ -233,12 +233,12 @@
*/
@Override
public UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException, PLException {
- VciBaseUtil.alertNotNull(formQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",formQuery.getBtmname(),"涓氬姟绫诲瀷鐨勪俊鎭�",formQuery.getOid(),"涓氬姟鏁版嵁鐨勪富閿�",formQuery.getFormDefineId(),"琛ㄥ崟鐨勫畾涔夌紪鍙�");
+ VciBaseUtil.alertNotNull(formQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",formQuery.getBtmName(),"涓氬姟绫诲瀷鐨勪俊鎭�",formQuery.getSourceOid(),"涓氬姟鏁版嵁鐨勪富閿�",formQuery.getFormDefineId(),"琛ㄥ崟鐨勫畾涔夌紪鍙�");
// TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
if(Func.isNotEmpty(formQuery.getSourceData())){
formQuery.setSourceData(this.convertMapValueJson2Map(formQuery.getSourceData()));
}
- UIFormDefineVO formDefineVO = uiEngineService.getFormById(formQuery.getBtmname(),formQuery.getFormDefineId());
+ UIFormDefineVO formDefineVO = uiEngineService.getFormById(formQuery.getBtmName(),formQuery.getFormDefineId());
String queryTemplate = !CollectionUtils.isEmpty(formQuery.getSourceData())? (String) formQuery.getSourceData().getOrDefault("querytemplate",formDefineVO.getQueryTemplateName()) :formDefineVO.getQueryTemplateName();
Set<String> queryFieldList = formDefineVO.getItems().stream().filter(s->!UIFieldTypeEnum.CUSTOM.getValue().equalsIgnoreCase(s.getType())).map(UIFormItemVO::getField).collect(Collectors.toSet());
//鑾峰彇鍙傜収
@@ -262,27 +262,27 @@
OsBtmTypeVO btmTypeVO = null;
OsLinkTypeVO linkTypeVO = null;
if(formDefineVO.isLinkTypeFlag()){
- linkTypeVO = linkTypeService.getLinkTypeById(formQuery.getBtmname());
+ linkTypeVO = linkTypeService.getLinkTypeById(formQuery.getBtmName());
queryFieldList.addAll(linkTypeVO.getAttributes().stream().map(OsLinkTypeAttributeVO::getId).collect(Collectors.toList()));
queryFieldList.addAll(WebLoServiceImpl.LO_BASE_FIELD_MAP.values());
}else{
- btmTypeVO = btmService.getBtmByName(formQuery.getBtmname());
+ btmTypeVO = btmService.getBtmByName(formQuery.getBtmName());
queryFieldList.addAll(btmTypeVO.getAttributes().stream().map(OsBtmTypeAttributeVO::getId).collect(Collectors.toList()));
}
queryFieldList.add("creator_name");
queryFieldList.add("lastmodifier_name");
- Map<String,String> conditionMap = WebUtil.getOidQuery(formQuery.getOid());
+ Map<String,String> conditionMap = WebUtil.getOidQuery(formQuery.getSourceOid());
Map<String, Object> replaceMap = wrapperReplaceMap(formQuery.getSourceData());
UIFormDataVO formDataVO = new UIFormDataVO();
- replaceMap.put("oid", formQuery.getOid().trim());
+ replaceMap.put("oid", formQuery.getSourceOid().trim());
if(!formDefineVO.isLinkTypeFlag()) {
List<BusinessObject> cbos = null;
if (StringUtils.isNotBlank(queryTemplate)) {
- replaceMap.put("oid", formQuery.getOid().trim());
+ // replaceMap.put("oid", formQuery.getOid().trim());
cbos = boService.queryCBOByScheme(queryTemplate, conditionMap, replaceMap, null, queryFieldList.stream().collect(Collectors.toList()));
} else {
//娌℃湁鏌ヨ妯℃澘锛岄偅鎴戜滑灏辩洿鎺ヤ富閿拰涓氬姟绫诲瀷鍘绘煡璇�
- cbos = boService.queryCBO(formQuery.getBtmname(), conditionMap, null, queryFieldList.stream().collect(Collectors.toList()));
+ cbos = boService.queryCBO(formQuery.getBtmName(), conditionMap, null, queryFieldList.stream().collect(Collectors.toList()));
}
if (!CollectionUtils.isEmpty(cbos)) {
BusinessObject cbo = cbos.get(0);
@@ -296,7 +296,7 @@
linkTypeDataQuery.setReplaceMap(replaceMap);
linkTypeDataQuery.setConditionMap(conditionMap);
linkTypeDataQuery.setClauseList(queryFieldList);
- linkTypeDataQuery.setLinkType(formQuery.getBtmname());
+ linkTypeDataQuery.setLinkType(formQuery.getBtmName());
//linkTypeDataQuery.setDirection(formQuery.isOrientation());
//linkTypeDataQuery.setToBtmType(treeDefineVO.getBtmType());
DataGrid dataGrid = loService.queryGridByScheme(linkTypeDataQuery);
@@ -305,7 +305,7 @@
}
}
//鏌ヨ闄勪欢
- formDataVO.setAttachmentFileVOs(fileObjectService.listFilesByOwnbiz(formQuery.getOid(), formQuery.getBtmname(), "attachment"));
+ formDataVO.setAttachmentFileVOs(fileObjectService.listFilesByOwnbiz(formQuery.getSourceOid(), formQuery.getBtmName(), "attachment"));
List<UIFormItemVO> fileItems = formDefineVO.getItems().stream().filter(s -> UIFieldTypeEnum.FILE.getValue().equalsIgnoreCase(s.getType())).collect(Collectors.toList());
if(!CollectionUtils.isEmpty(fileItems)){
//瀛楁鐨勫睘鎬ц偗瀹氫笉浼氳秴杩�1000涓�
@@ -367,7 +367,7 @@
*/
@Override
public List<UIDataTree> getDataForTree(UITreeQuery treeQuery) throws Exception {
- VciBaseUtil.alertNotNull(treeQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",treeQuery.getBtmname(),"涓氬姟绫诲瀷鐨勪俊鎭�",treeQuery.getComponentOid(),"鏍戞墍鍦ㄧ殑缁勪欢鐨勪富閿�");
+ VciBaseUtil.alertNotNull(treeQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",treeQuery.getBtmName(),"涓氬姟绫诲瀷鐨勪俊鎭�",treeQuery.getComponentOid(),"鏍戞墍鍦ㄧ殑缁勪欢鐨勪富閿�");
// TODO: 2024/12/4 Ludc 鍓嶇浼犺繃鏉ョ殑sourceData鍙傛暟鐨剉laue鍙兘鏄痡son杩欏効鍋氫竴涓嬪鐞�
if(Func.isNotEmpty(treeQuery.getSourceData())){
treeQuery.setSourceData(this.convertMapValueJson2Map(treeQuery.getSourceData()));
@@ -383,7 +383,7 @@
throw new VciBaseException("杩欎釜缁勪欢涓嶆槸鏍�");
}
if(!treeQuery.isLinkTypeFlag() && StringUtils.isBlank(treeQuery.getParentBtmName())){
- treeQuery.setParentBtmName(treeQuery.getBtmname());
+ treeQuery.setParentBtmName(treeQuery.getBtmName());
}
//TODO: 鏇挎崲鏍戝畾涔変笂鐨勬鍙嶅悜鏌ヨ灞炴�э紝鍥犱负姝ｅ弽鍚戞煡璇㈡槸鐢遍摼鎺ョ被鍨嬫煡璇㈡ā鏉夸笂鎺у埗鐨�
boolean isOrientation = false; //鏄惁鍙嶅悜锛屼娇鐢ㄦā鏉夸笂閰嶇疆鐨�
--
Gitblit v1.10.0