From 6fa303060c4cb4c2fe2da27912af35f428c1bde4 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 27 Sep 2022 14:50:27 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E8=A1=A8=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../db/migration/V0.0.14__pli_rent_contract_file_update.sql | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql new file mode 100644 index 0000000..84a15d1 --- /dev/null +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql @@ -0,0 +1,2 @@ +ALTER TABLE epmet_pli_power.pli_rent_contract_file ADD FILE_NAME varchar(512) NULL COMMENT '文件名'; +ALTER TABLE epmet_pli_power.pli_rent_contract_file CHANGE FILE_NAME FILE_NAME varchar(512) NULL COMMENT '文件名' AFTER FILE_TYPE; From 948fef803a76f37e56850d2695ba939e553408dc Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 27 Sep 2022 14:53:28 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=8E=9F=E5=A7=8B=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/plugin/power/dto/rent/RentContractFileDTO.java | 5 +++++ .../power/modules/rent/entity/RentContractFileEntity.java | 5 +++++ .../rent/service/impl/RentContractInfoServiceImpl.java | 1 + 3 files changed, 11 insertions(+) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java index 34faf2b..49b34b1 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java @@ -36,6 +36,11 @@ public class RentContractFileDTO implements Serializable { */ private String fileType; + /** + * 文件原始名称 + */ + private String fileName; + /** * 删除标识 0：未删除，1：删除 */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java index 07b844b..056f6db 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java @@ -36,6 +36,11 @@ public class RentContractFileEntity extends BaseEpmetEntity { */ private String fileType; + /** + * 文件原始名称 + */ + private String fileName; + /** * 客户ID */ diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index 052dce2..e21d993 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -410,6 +410,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl { item.setReferenceId(contractId); item.setFileType(NumConstant.FOUR_STR); + item.setFileName(item.getFileName()); item.setCustomerId(loginUserUtil.getLoginUserCustomerId()); }); rentContractFileService.insertBatch(fileList); From 88a298b0980ed960f8f388c81d160b0e7f11b9d1 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 27 Sep 2022 15:24:09 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/plugin/power/dto/rent/RentContractFileDTO.java | 2 +- .../power/modules/rent/entity/RentContractFileEntity.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java index 49b34b1..57795cd 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractFileDTO.java @@ -39,7 +39,7 @@ public class RentContractFileDTO implements Serializable { /** * 文件原始名称 */ - private String fileName; + private String name; /** * 删除标识 0：未删除，1：删除 diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java index 056f6db..5825ebb 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractFileEntity.java @@ -39,7 +39,7 @@ public class RentContractFileEntity extends BaseEpmetEntity { /** * 文件原始名称 */ - private String fileName; + private String name; /** * 客户ID From d133c9f39f72dae4b84d586f175fe9d101e597d3 Mon Sep 17 00:00:00 2001 From: zhangyuan Date: Tue, 27 Sep 2022 15:27:27 +0800 Subject: [PATCH 4/4] bug --- .../rent/service/impl/RentContractInfoServiceImpl.java | 2 +- .../db/migration/V0.0.14__pli_rent_contract_file_update.sql | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java index e21d993..017e68b 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java @@ -410,7 +410,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl { item.setReferenceId(contractId); item.setFileType(NumConstant.FOUR_STR); - item.setFileName(item.getFileName()); + item.setName(item.getName()); item.setCustomerId(loginUserUtil.getLoginUserCustomerId()); }); rentContractFileService.insertBatch(fileList); diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql index 84a15d1..6c61272 100644 --- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql +++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/db/migration/V0.0.14__pli_rent_contract_file_update.sql @@ -1,2 +1,2 @@ -ALTER TABLE epmet_pli_power.pli_rent_contract_file ADD FILE_NAME varchar(512) NULL COMMENT '文件名'; -ALTER TABLE epmet_pli_power.pli_rent_contract_file CHANGE FILE_NAME FILE_NAME varchar(512) NULL COMMENT '文件名' AFTER FILE_TYPE; +ALTER TABLE epmet_pli_power.pli_rent_contract_file ADD NAME varchar(512) NULL COMMENT '文件名'; +ALTER TABLE epmet_pli_power.pli_rent_contract_file CHANGE NAME NAME varchar(512) NULL COMMENT '文件名' AFTER FILE_TYPE;