From e471784e4e1ccfd4f0bf7246c54ea800ed956701 Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Thu, 3 Nov 2022 08:57:13 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=BA=94=E7=94=A8):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=AD=97=E6=AE=B5=E6=9C=AA=E6=9B=BF?= =?UTF-8?q?=E6=8D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../panel/PanelAppTemplateService.java | 25 +++++++++++++++---- 1 file changed, 20 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java index 32eadadfab..5fb7ef3a87 100644 --- a/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java +++ b/backend/src/main/java/io/dataease/service/panel/PanelAppTemplateService.java @@ -193,11 +193,26 @@ public class PanelAppTemplateService { public Map applyDatasetField(List datasetTableFieldsInfo, Map datasetsRealMap) { Map datasetFieldsRealMap = new HashMap<>(); for (DatasetTableField datasetTableField : datasetTableFieldsInfo) { - String oldId = datasetTableField.getId(); - datasetTableField.setTableId(datasetsRealMap.get(datasetTableField.getTableId())); - datasetTableField.setId(null); - DatasetTableField newTableField = dataSetTableFieldsService.save(datasetTableField); - datasetFieldsRealMap.put(oldId, newTableField.getId()); + if(datasetTableField.getExtField()!=2){ + String oldId = datasetTableField.getId(); + datasetTableField.setTableId(datasetsRealMap.get(datasetTableField.getTableId())); + datasetTableField.setId(null); + DatasetTableField newTableField = dataSetTableFieldsService.save(datasetTableField); + datasetFieldsRealMap.put(oldId, newTableField.getId()); + } + } + //数据集计算字段替换 + for (DatasetTableField datasetTableField : datasetTableFieldsInfo) { + if(datasetTableField.getExtField()==2){ + String oldId = datasetTableField.getId(); + datasetTableField.setTableId(datasetsRealMap.get(datasetTableField.getTableId())); + datasetTableField.setId(null); + datasetFieldsRealMap.forEach((k, v) -> { + datasetTableField.setOriginName(datasetTableField.getOriginName().replaceAll(k, v)); + }); + DatasetTableField newTableField = dataSetTableFieldsService.save(datasetTableField); + datasetFieldsRealMap.put(oldId, newTableField.getId()); + } } return datasetFieldsRealMap; }