Merge branch 'feature/visit_zhy' into dev

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：删除
      */

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
 	 */

epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentContractInfoServiceImpl.java

@@ -494,6 +494,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             fileList.forEach(item -> {
                 item.setReferenceId(contractId);
                 item.setFileType(NumConstant.FOUR_STR);
+                item.setFileName(item.getFileName());
                 item.setCustomerId(loginUserUtil.getLoginUserCustomerId());
             });
             rentContractFileService.insertBatch(fileList);

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;