表单定义代码修改上传

 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 +

 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 +

 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/PortalVIVO.java

 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java

@@ -655,8 +655,6 @@
                if (StringUtils.isNotBlank(rtnContent)) {
                   throw new VciBaseException(rtnContent);
                }
            }else{

            }
            labelName= PortalVIType.getByIntVal(portalVIDTO.getViType()).getLabel();
            if(!_isBtm){
@@ -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)){