From b2f8d5b86290c0751d26e9698417b652ec3cebe1 Mon Sep 17 00:00:00 2001 From: jianjun Date: Sun, 24 Apr 2022 16:22:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E9=9C=80=E8=A6=81=E5=AF=BC?= =?UTF-8?q?=E5=87=BA=E7=9A=84=E9=85=8D=E7=BD=AE=20=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E7=94=9F=E6=88=90excel=203?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/result/IcCustomExportResultDTO.java | 2 ++ .../feign/OperCustomizeOpenFeignClient.java | 4 ++-- .../impl/IcExportTemplateServiceImpl.java | 18 +++++++++++------- 3 files changed, 15 insertions(+), 9 deletions(-) diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java index 363714ab18..d3ff2b2e22 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/dto/result/IcCustomExportResultDTO.java @@ -2,6 +2,7 @@ package com.epmet.dto.result; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.ArrayList; @@ -35,6 +36,7 @@ public class IcCustomExportResultDTO implements Serializable { */ private List hiddenSqlColumns; + @NoArgsConstructor @AllArgsConstructor @Data public static class SqlColumn { diff --git a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java index 65b1d43609..f461c4cf9e 100644 --- a/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java +++ b/epmet-module/oper-customize/oper-customize-client/src/main/java/com/epmet/feign/OperCustomizeOpenFeignClient.java @@ -25,8 +25,8 @@ import java.util.Set; * @author yinzuomei@elink-cn.com * @date 2020/6/4 13:16 */ -// @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") -@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) + @FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class,url = "http://localhost:8089") +//@FeignClient(name = ServiceConstant.OPER_CUSTOMIZE_SERVER, fallbackFactory = OperCustomizeOpenFeignClientFallbackFactory.class) public interface OperCustomizeOpenFeignClient { @PostMapping(value = "/oper/customize/customerfootbar/customerfootbars", consumes = MediaType.APPLICATION_JSON_UTF8_VALUE) 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 fda8e0fecd..d5bdca582f 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 @@ -103,14 +103,12 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl remoteItemList = icFormItemDao.getConditionRemoteItems(param.getCustomerId(), param.getFormCode()); Map> resultTemp = list.stream().collect(Collectors.groupingBy(IcExportTemplateForExportResultDTO::getPid, LinkedHashMap::new, Collectors.toList())); - List> headerMap = new ArrayList<>(); + List> headerList = new ArrayList<>(); List showSqlColumns = new ArrayList<>(); List hiddenSqlColumns = new ArrayList<>(); Set hasExistColumnSet = new HashSet<>(); resultTemp.get(NumConstant.ZERO_STR).forEach(root -> { - List headerGroupList = new ArrayList<>(); - digui(resultTemp, root, headerGroupList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); - headerMap.add(headerGroupList); + digui(resultTemp, root, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); }); //组织 关联item项的 if (hasExistColumnSet.size() > NumConstant.ZERO) { @@ -129,14 +127,16 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl> resultTemp, IcExportTemplateForExportResultDTO root, List headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { - headerList.add(root.getLabel()); + private void digui(Map> resultTemp, IcExportTemplateForExportResultDTO root, List> headerList, List showSqlColumns, List hiddenSqlColumns, Set hasExistColumnSet) { + + + if (StringUtils.isNotBlank(root.getColumnName())) { showSqlColumns.add(new IcCustomExportResultDTO.SqlColumn(root.getTableName(), root.getColumnName())); if (StringUtils.isNotBlank(root.getOptionSourceValue())) { @@ -150,6 +150,10 @@ public class IcExportTemplateServiceImpl extends BaseServiceImpl { + List headerGroupList = new ArrayList<>(); + headerGroupList.add(root.getLabel()); + headerGroupList.add(o.getLabel()); + headerList.add(headerGroupList); digui(resultTemp, o, headerList, showSqlColumns, hiddenSqlColumns, hasExistColumnSet); }); }