From 7278a2e4642059e26d859ef069a8f172e7e2fd6e Mon Sep 17 00:00:00 2001
From: sunyuchao <syc_ls@163.com>
Date: Mon, 25 Apr 2022 15:58:17 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E6=A8=A1=E6=9D=BF=E5=AF=BC=E5=87=BA=E2=80=94?=
 =?UTF-8?q?=E2=80=94=E4=BF=9D=E5=AD=98=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/IcExportTemplateServiceImpl.java     | 50 +++++++++----------
 1 file changed, 24 insertions(+), 26 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
index 52872f5c66..a358a47698 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/service/impl/IcExportTemplateServiceImpl.java
@@ -125,12 +125,30 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
             tempEntity.setSort(sort);
         }
 
-        //3.组装待保存和待返回数据对象
+        //3.递归遍历组装待保存和待返回数据对象【目前业务表单项是两层，此方法支持多层】
+        packageData(formDTO.getItemList(), "0", customerId, tempId, resultList, itemList);
+
+        //4.执行数据保存
+        if (formDTO.getIsTemp()) {
+            baseDao.insert(tempEntity);
+            icExportTemplateConfigService.insertBatch(itemList);
+        }
+        //5.返回组装数据对象
+        return resultList;
+    }
+
+    /**
+     * @Author sun
+     * @Description 递归处理可能存在的多层表单数据[目前业务上是两次]
+     **/
+    private void packageData(List<IcExportItemListFormDTO> dataList, String pid, String customerId, String tempId,
+                             List<IcExportTemplateForExportResultDTO> resultList, List<IcExportTemplateConfigEntity> itemList) {
         int num = 0;
-        for (IcExportItemListFormDTO dto : formDTO.getItemList()) {
+        //1.遍历一级表单项
+        for (IcExportItemListFormDTO dto : dataList) {
             IcExportTemplateConfigEntity itemEntity = ConvertUtils.sourceToTarget(dto, IcExportTemplateConfigEntity.class);
             itemEntity.setId(UUID.randomUUID().toString().replace("-", ""));
-            itemEntity.setPid("0");
+            itemEntity.setPid(pid);
             itemEntity.setCustomerId(customerId);
             itemEntity.setTempId(tempId);
             num += 1;
@@ -141,31 +159,11 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl<IcExportTemplat
             resultDTO.setPid(itemEntity.getPid());
             resultDTO.setSort(itemEntity.getSort());
             resultList.add(resultDTO);
-            int subNum = 0;
-            for (IcExportItemListFormDTO subDTO : dto.getChildren()) {
-                IcExportTemplateConfigEntity subItem = ConvertUtils.sourceToTarget(subDTO, IcExportTemplateConfigEntity.class);
-                subItem.setId(UUID.randomUUID().toString().replace("-", ""));
-                subItem.setPid(itemEntity.getId());
-                subItem.setCustomerId(customerId);
-                subItem.setTempId(tempId);
-                subNum += 1;
-                subItem.setSort(subNum);
-                itemList.add(subItem);
-                IcExportTemplateForExportResultDTO subResultDTO = ConvertUtils.sourceToTarget(subDTO, IcExportTemplateForExportResultDTO.class);
-                subResultDTO.setId(subItem.getId());
-                subResultDTO.setPid(subItem.getPid());
-                subResultDTO.setSort(subItem.getSort());
-                resultList.add(subResultDTO);
+            //2.递归遍历子集表单项
+            if (!CollectionUtils.isEmpty(dto.getChildren())) {
+                packageData(dto.getChildren(), itemEntity.getId(), customerId, tempId, resultList, itemList);
             }
         }
-
-        //4.执行数据保存
-        if (formDTO.getIsTemp()) {
-            baseDao.insert(tempEntity);
-            icExportTemplateConfigService.insertBatch(itemList);
-        }
-        //5.返回组装数据对象
-        return resultList;
     }