From e26e40500625920d01e538772c2e824ed9a31897 Mon Sep 17 00:00:00 2001 From: zhou keda <1315948824@qq.com> Date: Tue, 8 Oct 2024 14:30:06 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=97=B6=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E9=87=8D=E5=86=99=E4=BA=86=E5=B0=B1=E8=B0=83=E7=94=A8=E9=87=8D?= =?UTF-8?q?=E5=86=99=E7=9A=841?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Tnb.VisualDev/VisualDevModelDataService.cs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs index b51be987..87e13bd7 100644 --- a/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs +++ b/visualdev/Tnb.VisualDev/VisualDevModelDataService.cs @@ -529,10 +529,22 @@ namespace JNPF.VisualDev return await ReportExcel(input); #endregion - - VisualDevEntity? templateEntity = await _visualDevService.GetInfoById(modelId, true); + VisualDevEntity? templateEntity = templateEntity = await _visualDevService.GetInfoById(modelId, true); + PageResult>? pageList = null; if (input.dataType == "1") input.pageSize = 99999999; - PageResult>? pageList = await _runService.GetListResult(templateEntity, input); + + //导出时列表重写了就调用重写的 modifyby zkd 20241008 + var overideSvc = OverideVisualDevManager.GetOrDefault(modelId); + if (overideSvc != null && overideSvc.OverideFuncs.GetListAsync != null) + { + object result = await overideSvc.OverideFuncs.GetListAsync(input); + pageList = JsonConvert.DeserializeObject>>(JsonConvert.SerializeObject(result)); + } + else + { + pageList = await _runService.GetListResult(templateEntity, input); + } + // 如果是 分组表格 模板 ColumnDesignModel? columnData = templateEntity.ColumnData.ToObject(); // 列配置模型