From 35a67cb27e75061ffb7e836cc447135fc7d96220 Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Tue, 31 Oct 2023 17:09:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=91=98=E5=B7=A5,=E5=AE=A2=E8=AF=89,=E5=92=A8?= =?UTF-8?q?=E8=AF=A2,=E8=B5=84=E4=BA=A7=E6=A1=A3=E6=A1=88=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E4=B8=8A=E4=BC=A0=E6=96=87=E4=BB=B6=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231031JS.sql | 12 ++++++++++++ .../electronicassets/vo/ElectronicAssetsBaseVO.java | 3 +++ .../electronicassets/vo/ElectronicAssetsExcelVO.java | 7 +++++-- .../vo/ElectronicAssetsExportReqVO.java | 2 ++ .../vo/ElectronicAssetsPageReqVO.java | 3 +++ .../vo/ElectronicConsultationBaseVO.java | 3 +++ .../vo/ElectronicConsultationExcelVO.java | 3 +++ .../vo/ElectronicConsultationExportReqVO.java | 3 +++ .../vo/ElectronicConsultationPageReqVO.java | 4 ++++ .../vo/ElectronicCustomerComplaintBaseVO.java | 4 ++++ .../vo/ElectronicCustomerComplaintExcelVO.java | 3 +++ .../vo/ElectronicCustomerComplaintExportReqVO.java | 4 ++++ .../vo/ElectronicCustomerComplaintPageReqVO.java | 4 ++++ .../vo/ElectronicEmployeeBaseVO.java | 3 +++ .../vo/ElectronicEmployeeExcelVO.java | 3 +++ .../vo/ElectronicEmployeeExportReqVO.java | 3 +++ .../vo/ElectronicEmployeePageReqVO.java | 3 +++ 17 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 sql/20231031JS.sql diff --git a/sql/20231031JS.sql b/sql/20231031JS.sql new file mode 100644 index 00000000..04d37778 --- /dev/null +++ b/sql/20231031JS.sql @@ -0,0 +1,12 @@ + +-- 新增资产档案表 附件 字段 +ALTER TABLE ea_electronic_assets ADD COLUMN `contract_attachment` varchar(255) NULL DEFAULT NULL COMMENT '附件'; + +-- 新增员工档案表 附件 字段 +ALTER TABLE ea_electronic_employee ADD COLUMN `contract_attachment` varchar(255) NULL DEFAULT NULL COMMENT '附件'; + +-- 新增咨询档案表 附件 字段 +ALTER TABLE electronic_consultation ADD COLUMN `contract_attachment` varchar(255) NULL DEFAULT NULL COMMENT '附件'; + +-- 新增客诉档案表 附件 字段 +ALTER TABLE electronic_customer_complaint ADD COLUMN `contract_attachment` varchar(255) NULL DEFAULT NULL COMMENT '附件'; diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsBaseVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsBaseVO.java index b00fd483..85ffd404 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsBaseVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsBaseVO.java @@ -100,5 +100,8 @@ public class ElectronicAssetsBaseVO { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExcelVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExcelVO.java index 3669c186..820d2e50 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExcelVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExcelVO.java @@ -96,10 +96,13 @@ public class ElectronicAssetsExcelVO { private Long organizationId; - @Schema(description = "库房ID") + @ExcelProperty("库房ID") private Long depotId; - @Schema(description = "档案柜ID") + @ExcelProperty("档案柜ID") private Long cabinetId; + @ExcelProperty("附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExportReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExportReqVO.java index d6c62b43..d3e5bbd7 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExportReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsExportReqVO.java @@ -99,4 +99,6 @@ public class ElectronicAssetsExportReqVO { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsPageReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsPageReqVO.java index ee657fe5..029e3e81 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsPageReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicassets/vo/ElectronicAssetsPageReqVO.java @@ -101,4 +101,7 @@ public class ElectronicAssetsPageReqVO extends PageParam { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationBaseVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationBaseVO.java index c47f0155..5bd49343 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationBaseVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationBaseVO.java @@ -87,4 +87,7 @@ public class ElectronicConsultationBaseVO { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExcelVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExcelVO.java index 89c2455d..5819c890 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExcelVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExcelVO.java @@ -90,4 +90,7 @@ public class ElectronicConsultationExcelVO { @ExcelProperty( "档案柜ID") private Long cabinetId; + @ExcelProperty("附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExportReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExportReqVO.java index b886674f..db6c0c76 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExportReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationExportReqVO.java @@ -88,4 +88,7 @@ public class ElectronicConsultationExportReqVO { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationPageReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationPageReqVO.java index 51e8e597..9aa1d06b 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationPageReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicconsultation/vo/ElectronicConsultationPageReqVO.java @@ -88,4 +88,8 @@ public class ElectronicConsultationPageReqVO extends PageParam { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintBaseVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintBaseVO.java index 56e92688..e87cd246 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintBaseVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintBaseVO.java @@ -87,4 +87,8 @@ public class ElectronicCustomerComplaintBaseVO { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExcelVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExcelVO.java index 7c886aad..f460263f 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExcelVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExcelVO.java @@ -90,4 +90,7 @@ public class ElectronicCustomerComplaintExcelVO { @ExcelProperty("档案柜ID") private Long cabinetId; + @ExcelProperty("附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExportReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExportReqVO.java index 6ddaa24f..5cc9668c 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExportReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintExportReqVO.java @@ -86,4 +86,8 @@ public class ElectronicCustomerComplaintExportReqVO { @Schema(description = "档案柜ID") private Long cabinetId; + + @Schema(description = "附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintPageReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintPageReqVO.java index 814e8f5f..48613ba1 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintPageReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electroniccustomercomplaint/vo/ElectronicCustomerComplaintPageReqVO.java @@ -88,4 +88,8 @@ public class ElectronicCustomerComplaintPageReqVO extends PageParam { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeBaseVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeBaseVO.java index 43baca81..f140ef1d 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeBaseVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeBaseVO.java @@ -150,5 +150,8 @@ public class ElectronicEmployeeBaseVO { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExcelVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExcelVO.java index 42863d35..08b8b354 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExcelVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExcelVO.java @@ -76,4 +76,7 @@ public class ElectronicEmployeeExcelVO { @ExcelProperty("档案柜ID") private Long cabinetId; + @ExcelProperty("附件") + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExportReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExportReqVO.java index c2f9119b..8348c3da 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExportReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeeExportReqVO.java @@ -72,4 +72,7 @@ public class ElectronicEmployeeExportReqVO { @Schema(description = "档案柜ID") private Long cabinetId; + + @Schema(description = "附件") + private String contractAttachment; } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeePageReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeePageReqVO.java index aad4cef8..9aa83951 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeePageReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicemployee/vo/ElectronicEmployeePageReqVO.java @@ -79,4 +79,7 @@ public class ElectronicEmployeePageReqVO extends PageParam { @Schema(description = "档案柜ID") private Long cabinetId; + @Schema(description = "附件") + private String contractAttachment; + }