From e62ec0d2449648992b273ef955d1f726c93ffb17 Mon Sep 17 00:00:00 2001 From: CMM <2198256324@qq.com> Date: Mon, 27 Mar 2023 10:02:24 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=BA=93=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E9=80=89=E9=A1=B9=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java | 2 +- pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java index 6e22873..e246973 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/enumeration/ExportOptionEnum.java @@ -46,7 +46,7 @@ public enum ExportOptionEnum { buildOrgZheJiangGovDingId(14, "建设单位浙政钉ID"), - buildOrgCode(15, "建设单位统一信用代码"), + orgCreditCode(15, "建设单位统一信用代码"), projectType(16, "项目类型"), diff --git a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java index e6d760a..1eb9f3d 100644 --- a/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java +++ b/pmapi/src/main/java/com/ningdatech/pmapi/common/util/ExcelDownUtil.java @@ -201,7 +201,7 @@ public class ExcelDownUtil { for (ExportOptionEnum column : columnList) { List columnValues = Lists.newArrayList(); columnValues.add(column.getDesc()); - projects.stream().forEach(project -> { + projects.forEach(project -> { String s = JSON.toJSONString(project); JSONObject jsonObject = JSON.parseObject(s); String columnValue = String.valueOf(jsonObject.get(column.toString()));