From 337f88cc8182e9675e27394dc0a64aa3c8913ee1 Mon Sep 17 00:00:00 2001 From: "LAPTOP-0SF788NU\\admin" <3306174053@qq.com> Date: Wed, 1 Nov 2023 16:06:36 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=A8=E6=A1=A3=E6=A1=88=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E8=B7=AF=E5=BE=84=E5=AD=97=E6=AE=B5=E6=96=B0=E5=A2=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sql/20231101JS.sql | 4 ++++ .../controller/admin/bankslip/vo/BankSlipBaseVO.java | 2 +- .../admin/electronicother/vo/ElectronicOtherBaseVO.java | 6 ++++++ .../admin/electronicother/vo/ElectronicOtherExcelVO.java | 6 ++++++ .../electronicother/vo/ElectronicOtherExportReqVO.java | 6 ++++++ .../admin/electronicother/vo/ElectronicOtherPageReqVO.java | 6 ++++++ .../dal/dataobject/electronicassets/ElectronicAssetsDO.java | 5 +++++ .../electronicconsultation/ElectronicConsultationDO.java | 5 +++++ .../ElectronicCustomerComplaintDO.java | 6 ++++++ .../dataobject/electronicemployee/ElectronicEmployeeDO.java | 6 ++++++ .../dal/dataobject/electronicother/ElectronicOtherDO.java | 5 +++++ 11 files changed, 56 insertions(+), 1 deletion(-) diff --git a/sql/20231101JS.sql b/sql/20231101JS.sql index d26fb4a8..6bfc3561 100644 --- a/sql/20231101JS.sql +++ b/sql/20231101JS.sql @@ -14,3 +14,7 @@ ALTER TABLE electronic_other ADD COLUMN `files_num` varchar(64) NULL DEFAULT NUL ALTER TABLE electronic_other ADD COLUMN `organization_id` bigint(20) NULL DEFAULT NULL COMMENT '立档单位ID'; ALTER TABLE electronic_other ADD COLUMN `depot_id` bigint(20) NULL DEFAULT NULL COMMENT '库房ID'; ALTER TABLE electronic_other ADD COLUMN `cabinet_id` bigint(20) NULL DEFAULT NULL COMMENT '档案柜ID'; + + +-- 其他档案表 附件 字段 + ALTER TABLE electronic_other ADD COLUMN `contract_attachment` varchar(255) NULL DEFAULT NULL COMMENT '附件'; diff --git a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java index d33394c4..da2cec78 100644 --- a/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java +++ b/yudao-module-accounting/yudao-module-accounting-biz/src/main/java/cn/iocoder/yudao/module/accounting/controller/admin/bankslip/vo/BankSlipBaseVO.java @@ -15,7 +15,7 @@ import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_ @Data public class BankSlipBaseVO { - @Schema(description = "凭证id", example = "12880") + @Schema(description = "凭证id", example = "凭证id") private Long voucherId; @Schema(description = "OA/ERP流程编号") diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java index fe24f1c7..c0ff50e9 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherBaseVO.java @@ -83,4 +83,10 @@ public class ElectronicOtherBaseVO { @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/electronicother/vo/ElectronicOtherExcelVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java index d0851fc4..3a1a285d 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExcelVO.java @@ -91,4 +91,10 @@ public class ElectronicOtherExcelVO { @ExcelProperty("档案柜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/electronicother/vo/ElectronicOtherExportReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java index e4b248eb..d7d91e95 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherExportReqVO.java @@ -86,4 +86,10 @@ public class ElectronicOtherExportReqVO { @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/electronicother/vo/ElectronicOtherPageReqVO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java index 808d341c..afc8e95b 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/controller/admin/electronicother/vo/ElectronicOtherPageReqVO.java @@ -88,4 +88,10 @@ public class ElectronicOtherPageReqVO 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/dal/dataobject/electronicassets/ElectronicAssetsDO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicassets/ElectronicAssetsDO.java index d8ebc593..b514a2bb 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicassets/ElectronicAssetsDO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicassets/ElectronicAssetsDO.java @@ -136,4 +136,9 @@ public class ElectronicAssetsDO extends BaseDO { */ private Long cabinetId; + /** + * 附件 + */ + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicconsultation/ElectronicConsultationDO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicconsultation/ElectronicConsultationDO.java index aac8a3d2..3d6d69b9 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicconsultation/ElectronicConsultationDO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicconsultation/ElectronicConsultationDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.ea.dal.dataobject.electronicconsultation; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -143,4 +144,8 @@ public class ElectronicConsultationDO extends BaseDO { */ private Long cabinetId; + /** + * 附件 + */ + private String contractAttachment; } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electroniccustomercomplaint/ElectronicCustomerComplaintDO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electroniccustomercomplaint/ElectronicCustomerComplaintDO.java index 5e8c3112..4aaecf30 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electroniccustomercomplaint/ElectronicCustomerComplaintDO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electroniccustomercomplaint/ElectronicCustomerComplaintDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.ea.dal.dataobject.electroniccustomercomplaint; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.util.*; import java.time.LocalDateTime; @@ -139,4 +140,9 @@ public class ElectronicCustomerComplaintDO extends BaseDO { */ private Long cabinetId; + + /** + * 附件 + */ + private String contractAttachment; } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicemployee/ElectronicEmployeeDO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicemployee/ElectronicEmployeeDO.java index 9e97c2e8..fea69a28 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicemployee/ElectronicEmployeeDO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicemployee/ElectronicEmployeeDO.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.ea.dal.dataobject.electronicemployee; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.*; import java.time.LocalDate; @@ -235,4 +236,9 @@ public class ElectronicEmployeeDO extends BaseDO { */ private Long cabinetId; + /** + * 附件 + */ + private String contractAttachment; + } diff --git a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java index 8517ef05..e16b0937 100644 --- a/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java +++ b/yudao-module-electronic/yudao-module-ea-biz/src/main/java/cn/iocoder/yudao/module/ea/dal/dataobject/electronicother/ElectronicOtherDO.java @@ -121,4 +121,9 @@ public class ElectronicOtherDO extends BaseDO { * 档案柜ID */ private Long cabinetId; + + /** + * 附件 + */ + private String contractAttachment; }