From 2257bd67da05cbcd690676a8611078cec5f9aa47 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 18 十月 2024 16:55:49 +0800
Subject: [PATCH] 表单定义代码修改上传
---
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java | 14 +++++++-------
Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java | 30 ++++++++++++++----------------
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PortalVIVO.java | 2 +-
Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java | 10 +++++-----
4 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java
index 11387e0..bb149a8 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/PRMItemDTO.java
@@ -51,7 +51,7 @@
/**
* 寰呴�夋嫨鐨勫睘鎬у瓧娈�
*/
- private List<String> itemSelectoutFieldList=new ArrayList<>();
+ private List<String> itemSelectOutFieldList=new ArrayList<>();
/**
* 闇�瑕佷娇鐢ㄧ殑闆嗗悎
*/
@@ -618,11 +618,11 @@
}
public List<String> getItemSelectoutFieldList() {
- return itemSelectoutFieldList;
+ return itemSelectOutFieldList;
}
- public void setItemSelectoutFieldList(List<String> itemSelectoutFieldList) {
- this.itemSelectoutFieldList = itemSelectoutFieldList;
+ public void setItemSelectoutFieldList(List<String> itemSelectOutFieldList) {
+ this.itemSelectOutFieldList = itemSelectOutFieldList;
}
public List<String> getItemSearchFieldList() {
@@ -723,7 +723,7 @@
", itemPageSize='" + itemPageSize + '\'' +
", itemImgWH='" + itemImgWH + '\'' +
", itemOutFields='" + itemOutFields + '\'' +
- ", itemSelectoutFieldList=" + itemSelectoutFieldList +
+ ", itemSelectOutFieldList=" + itemSelectOutFieldList +
", itemOutFieldList=" + itemOutFieldList +
", itemKeyFields='" + itemKeyFields + '\'' +
", itemSearchFieldList=" + itemSearchFieldList +
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java
index 8632263..57ab67c 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PRMItemVO.java
@@ -50,7 +50,7 @@
/**
* 寰呴�夋嫨鐨勫睘鎬у瓧娈�
*/
- private List<String> itemSelectoutFieldList=new ArrayList<>();
+ private List<String> itemSelectOutFieldList=new ArrayList<>();
/**
@@ -144,7 +144,7 @@
* 鏋氫妇鍊�
*/
private List<String> itemValueList = null;
- /***
+ /**
* 鏋氫妇鍊奸泦鍚�
*/
private List<KeyValue> itemKeyValueList=new ArrayList<>();
@@ -620,12 +620,12 @@
this.itemSeniorQueryBOS = itemSeniorQueryBOS;
}
- public List<String> getItemSelectoutFieldList() {
- return itemSelectoutFieldList;
+ public List<String> getItemSelectOutFieldList() {
+ return itemSelectOutFieldList;
}
- public void setItemSelectoutFieldList(List<String> itemSelectoutFieldList) {
- this.itemSelectoutFieldList = itemSelectoutFieldList;
+ public void setItemSelectOutFieldList(List<String> itemSelectOutFieldList) {
+ this.itemSelectOutFieldList = itemSelectOutFieldList;
}
public List<String> getItemSearchFieldList() {
@@ -659,7 +659,7 @@
", itemPageSize='" + itemPageSize + '\'' +
", itemImgWH='" + itemImgWH + '\'' +
", itemOutFields='" + itemOutFields + '\'' +
- ", itemSelectoutFieldList=" + itemSelectoutFieldList +
+ ", itemSelectOutFieldList=" + itemSelectOutFieldList +
", itemOutFieldList=" + itemOutFieldList +
", itemKeyFields='" + itemKeyFields + '\'' +
", itemSearchFieldList=" + itemSearchFieldList +
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PortalVIVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PortalVIVO.java
index 1ffbe3d..97c9ffe 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PortalVIVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PortalVIVO.java
@@ -45,7 +45,7 @@
/**
* 瀹氫箟璇︽儏
*/
- private PRMVO prm;
+ private PRMVO prm;
public String getId() {
return id;
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
index 36e1356..d6ca935 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -128,7 +128,7 @@
GetPagePortalVIArrayByPageInfoResult pagePortalVIArrayByPageInfoResult= platformClientUtil.getPortalService().getPagePortalVIArrayByPageInfo(typeName,viName,viType,viTypeFlag,pageIndex,pageSize);
if(pagePortalVIArrayByPageInfoResult.total>0) {
PortalVI[] portalVIS = pagePortalVIArrayByPageInfoResult.returnValue;
- List<PortalVIVO> portalVIVOS= portalVIDOO2VOS(Arrays.asList(portalVIS));
+ List<PortalVIVO> portalVIVOS = portalVIDOO2VOS(Arrays.asList(portalVIS));
dataGrid.setData(portalVIVOS);
dataGrid.setTotal(pagePortalVIArrayByPageInfoResult.total);
}else{
@@ -149,7 +149,7 @@
*/
@Override
public BaseResult addSave(PortalVIDTO portalVIDTO) throws VciBaseException {
- return savePortalVIDTO(portalVIDTO,false);
+ return savePortalVIDTO(portalVIDTO,false);
}
/**
@@ -649,30 +649,28 @@
}
if(PortalVIType.Table.getIntVal()==portalVIDTO.getViType()){//濡傛灉鏄〃鏍肩殑鐨勬牎楠�
labelName=PortalVIType.Table.getName();
- PRMItemDTO prmItemDTO= portalVIDTO.getPrm().getPrmItemList().get(0);
+ PRMItemDTO prmItemDTO = portalVIDTO.getPrm().getPrmItemList().get(0);
//姣忛〉鏄剧ず鏍￠獙
String rtnContent = isCorrectPageNums(prmItemDTO.getItemPageSize());
if (StringUtils.isNotBlank(rtnContent)) {
throw new VciBaseException(rtnContent);
}
- }else{
-
}
labelName= PortalVIType.getByIntVal(portalVIDTO.getViType()).getLabel();
if(!_isBtm){
- PortalVI[] portalVIS= platformClientUtil.getPortalService().getPortalVIArrayByTypeName(portalVIDTO.getTypeName());
+ PortalVI[] portalVIS = platformClientUtil.getPortalService().getPortalVIArrayByTypeName(portalVIDTO.getTypeName());
for (int i = 0; i < portalVIS.length; i++) {
- PortalVI portalVI= portalVIS[i];
- String viName= portalVI.viName;
+ PortalVI portalVI = portalVIS[i];
+ String viName = portalVI.viName;
if(isEdit){//濡傛灉涓轰慨鏀�
try {
- PortalVI oldPortalVI= platformClientUtil.getPortalService().getPortalVIById(portalVIDTO.getId());
- flag=platformClientUtil.getPortalService().judgeUpdateButton(oldPortalVI.typeFlag, oldPortalVI.viName, oldPortalVI.typeName);
+ PortalVI oldPortalVI = platformClientUtil.getPortalService().getPortalVIById(portalVIDTO.getId());
+ flag = platformClientUtil.getPortalService().judgeUpdateButton(oldPortalVI.typeFlag, oldPortalVI.viName, oldPortalVI.typeName);
if (flag && (StringUtils.isNotBlank(portalVIDTO.getViName()))&&(!oldPortalVI.viName.equals(portalVIDTO.getViName()))) {
throw new Throwable("璇�"+labelName+"宸茬粡琚紩鐢紝涓嶈兘淇敼鍚嶇О!");
}
} catch (PLException e) {
- throw new Throwable("鏌ヨ鍘熸湁琛ㄥ崟鍑虹幇寮傚父:"+e.getMessage());
+ throw new Throwable("鏌ヨ鍘熸湁琛ㄥ崟鍑虹幇寮傚父:"+e.getMessage());
}
if (!portalVI.id.equals(portalVIDTO.getId())) {
if (portalVI.viName.equals(portalVIDTO.getViName())) {
@@ -885,7 +883,7 @@
portalVIVO.setViType(portalVI.viType);
portalVIVO.setViTypeText(PortalVIType.getByIntVal(portalVI.viType).getLabel());
- String prm= portalVI.prm;
+ String prm= portalVI.prm;
if(StringUtils.isNotBlank(prm)) {
PRMDO prmdo = UITools.getPRM(prm);
portalVIVO.setPrm(prmDOO2VOS(prmdo, portalVI.viType));
@@ -1166,8 +1164,8 @@
List<String> allKeyList= getRefFormVIName(prmItemDO.getItemInObj());
List<String> itemOutFieldList =VciBaseUtil.str2List(prmItemDO.getItemOutFields());
List<String> itemKeyFieldList =VciBaseUtil.str2List(prmItemDO.getItemKeyFields());
- List<String> itemSelectoutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
- prmItemVO.setItemSelectoutFieldList(itemSelectoutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
+ List<String> itemSelectOutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
+ prmItemVO.setItemSelectOutFieldList(itemSelectOutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
prmItemVO.setItemOutFieldList(itemOutFieldList);//闇�瑕佷娇鐢ㄧ殑闆嗗悎
// List<String> itemSearchFieldList= itemOutFieldList.stream().filter(s ->!CollectionUtils.isEmpty(itemKeyFieldList).stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
List<String> itemSearchFieldList=new ArrayList<>();
@@ -1190,8 +1188,8 @@
List<String> allKeyList= getRefFormVIName(prmItemDO.getItemInObj());
List<String> itemOutFieldList =VciBaseUtil.str2List(prmItemDO.getItemOutFields());
List<String> itemKeyFieldList =VciBaseUtil.str2List(prmItemDO.getItemKeyFields());
- List<String> itemSelectoutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
- prmItemDTO.setItemSelectoutFieldList(itemSelectoutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
+ List<String> itemSelectOutFieldList= allKeyList.stream().filter(s ->!itemOutFieldList.stream().map(s1 -> s1).collect(Collectors.toList()).contains(s) ).collect(Collectors.toList());
+ prmItemDTO.setItemSelectoutFieldList(itemSelectOutFieldList);//寰呴�夋嫨鐨勫睘鎬у瓧娈�
prmItemDTO.setItemOutFieldList(itemOutFieldList);//闇�瑕佷娇鐢ㄧ殑闆嗗悎
List<String> itemSearchFieldList=new ArrayList<>();
if(!CollectionUtils.isEmpty(itemKeyFieldList)){
--
Gitblit v1.9.3