From 1169873a6c361eef727d8aa5e156ce52591163e8 Mon Sep 17 00:00:00 2001 From: zhuangdashia Date: Tue, 21 Oct 2025 19:02:33 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=89=E6=95=88=E6=97=A0=E6=95=88=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E9=A1=B5=E9=9D=A2=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/views/report/valid-invalid/index.vue | 18 +++++++++--------- .../vo/MarketingValidInvalidImportVo.java | 15 ++++++++------- .../domain/vo/MarketingValidInvalidVo.java | 15 ++++++++------- 3 files changed, 25 insertions(+), 23 deletions(-) diff --git a/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue b/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue index 9512035..4a15cf1 100644 --- a/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue +++ b/cds-fontend-2025.V1/src/views/report/valid-invalid/index.vue @@ -115,17 +115,17 @@ const { ellipsis: true, resizable: true }, - { - key: 'invalidBusiness', - title: '无效的中间业务计价项目', - align: 'center', - minWidth: 120, - ellipsis: true, - resizable: true - }, + // { + // key: 'invalidBusiness', + // title: '无效的中间业务计价项目', + // align: 'center', + // minWidth: 120, + // ellipsis: true, + // resizable: true + // }, { key: 'validBusiness', - title: '有效的中间业务计价项目', + title: '中间业务计价项目', align: 'center', minWidth: 120, ellipsis: true, diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java index e6ee19c..fee9c1c 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidImportVo.java @@ -66,11 +66,11 @@ public class MarketingValidInvalidImportVo implements Serializable { @ExcelProperty(value = "客户身份证号") private String customerId; - /** - * 无效的中间业务计价项目 - */ - @ExcelProperty(value = "无效的中间业务计价项目") - private String invalidBusiness; +// /** +// * 无效的中间业务计价项目 +// */ +// @ExcelProperty(value = "无效的中间业务计价项目") +// private String invalidBusiness; /** * 有效的中间业务计价项目 @@ -79,9 +79,10 @@ public class MarketingValidInvalidImportVo implements Serializable { private String validBusiness; /** - * 有效无效标识 + * 有效无效标识 1有效 9 无效 */ - @ExcelProperty(value = "有效无效标识") + @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "report_valid_invalid") private String checkFlag; /** diff --git a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java index 79bb37b..f251207 100644 --- a/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java +++ b/cds-platform-2025.V1/cds-modules/cds-system/src/main/java/org/dromara/report/domain/vo/MarketingValidInvalidVo.java @@ -64,22 +64,23 @@ public class MarketingValidInvalidVo implements Serializable { @ExcelProperty(value = "客户身份证号") private String customerId; - /** - * 无效的中间业务计价项目 - */ - @ExcelProperty(value = "无效的中间业务计价项目") - private String invalidBusiness; +// /** +// * 无效的中间业务计价项目 +// */ +// @ExcelProperty(value = "无效的中间业务计价项目") +// private String invalidBusiness; /** * 有效的中间业务计价项目 */ - @ExcelProperty(value = "有效的中间业务计价项目") + @ExcelProperty(value = "中间业务计价项目") private String validBusiness; /** * 有效无效标识 */ - @ExcelProperty(value = "有效无效标识") + @ExcelProperty(value = "有效无效标识", converter = ExcelDictConvert.class) + @ExcelDictFormat(dictType = "report_valid_invalid") private String checkFlag; /**