From 1615c6851b507867f9090f8cafcb1a32d1dad6bc Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期五, 06 九月 2024 12:09:57 +0800
Subject: [PATCH] 表单表格功能添加

---
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java |   32 ++++++++++++++++++++++++++++++++
 1 files changed, 32 insertions(+), 0 deletions(-)

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 5db621e..36e1356 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
@@ -988,6 +988,15 @@
         prmItemDO.setItemHttpPathField(prmItemDTO.getItemHttpPathField());
         if(viType==PortalVIType.Table.getIntVal()) {//濡傛灉鏄〃鏍�
             initTableConfigDTOO2DOData(prmItemDO,prmItemDTO);
+        }else{
+            List<String> itemValueList=new ArrayList<>();
+            List<KeyValue> keyValueList=prmItemDTO.getItemKeyValueList();
+            Optional.ofNullable(keyValueList).orElseGet(()->new ArrayList<>()).stream().forEach(keyValue -> {
+              String value=  keyValue.getValue()+"{"+keyValue.getKey()+"}";
+                itemValueList.add(value);
+            });
+            prmItemDO.setItemValueList(itemValueList);
+
         }
         return prmItemDO;
     }
@@ -1052,8 +1061,20 @@
         prmItemVO.setItemIsHttpSave(prmItemDO.getItemIsHttpSave());
         prmItemVO.setItemHttpVolumnPath(prmItemDO.getItemHttpVolumnPath());
         prmItemVO.setItemHttpPathField(prmItemDO.getItemHttpPathField());
+
         if(viType==PortalVIType.Table.getIntVal()) {//濡傛灉鏄〃鏍�
             initTableConfigDOO2VOData(prmItemVO,prmItemDO);
+        }else{
+          List<String> enumList=  prmItemDO.getItemValueList();
+          List<KeyValue>itemKeyValueList=new ArrayList<>();
+            Optional.ofNullable(enumList).orElseGet(()->new ArrayList<>()).stream().forEach(enumValue->{
+             List<String> keyValueList=  VciBaseUtil.str2List(VciBaseUtil.removeComma(enumValue,"}"),"\\{");
+                KeyValue keyValue=new KeyValue();
+                keyValue.setKey(keyValueList.get(1));
+                keyValue.setValue(keyValueList.get(0));
+                itemKeyValueList.add(keyValue);
+            });
+            prmItemVO.setItemKeyValueList(itemKeyValueList);
         }
         return prmItemVO;
     }
@@ -1120,6 +1141,17 @@
         prmItemDTO.setItemHttpPathField(prmItemDO.getItemHttpPathField());
         if(viType==PortalVIType.Table.getIntVal()) {//濡傛灉鏄〃鏍�
             initTableConfigDOO2VOData(prmItemDTO,prmItemDO);
+        }else{
+            List<String> enumList=  prmItemDO.getItemValueList();
+            List<KeyValue>itemKeyValueList=new ArrayList<>();
+            Optional.ofNullable(enumList).orElseGet(()->new ArrayList<>()).stream().forEach(enumValue->{
+                List<String> keyValueList=  VciBaseUtil.str2List(VciBaseUtil.removeComma(enumValue,"}"),"\\{");
+                KeyValue keyValue=new KeyValue();
+                keyValue.setKey(keyValueList.get(1));
+                keyValue.setValue(keyValueList.get(0));
+                itemKeyValueList.add(keyValue);
+            });
+            prmItemDTO.setItemKeyValueList(itemKeyValueList);
         }
         return prmItemDTO;
     }

--
Gitblit v1.9.3