From b0962b02c539da42a1f145a9a0a020f2df324e91 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Tue, 27 Sep 2022 10:05:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=96=B0=E7=9A=84=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../power/dto/rent/RentContractInfoDTO.java       |  7 ++++++-
 .../rent/entity/RentContractFileEntity.java       |  2 +-
 .../service/impl/RentContractInfoServiceImpl.java | 15 ++++++++++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java
index e0351b5..1f11537 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java
@@ -198,11 +198,16 @@ public class RentContractInfoDTO implements Serializable {
     private List<RentTenantInfoDTO> tenantList;
 
     /**
-     * 附件列表
+     * 附件列表（图片）
      */
     @NotEmpty
     private List<RentContractFileDTO> fileList;
 
+    /**
+     * 附件列表（文件）
+     */
+    private List<RentContractFileDTO> docList;
+
     /**
      * 中介资料
      */
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 1315055..07b844b 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
@@ -32,7 +32,7 @@ public class RentContractFileEntity extends BaseEpmetEntity {
 	private String fileUrl;
 
 	/**
-	 * 文件类型 0：图片（人脸/头像），1 文件（合同），2 身份证照片，3 中介资料
+	 * 文件类型 0：图片（人脸/头像），1 文件（合同照片），2 身份证照片，3 中介资料，4 文件（其他文档）
 	 */
 	private String fileType;
 
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 9551e26..052dce2 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
@@ -175,6 +175,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         // 取出合同文件信息
         dto.setFileList(rentContractFileService.listByRefAndType(dto.getId(), NumConstant.ONE_STR));
         dto.setAgencyImgList(rentContractFileService.listByRefAndType(dto.getId(), NumConstant.THREE_STR));
+        dto.setDocList(rentContractFileService.listByRefAndType(dto.getId(), NumConstant.FOUR_STR));
 
         return dto;
     }
@@ -390,7 +391,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             });
 
         }
-        // 附件处理
+        // 图片附件处理
         if (null == dto.getFileList() || dto.getFileList().isEmpty()) {
             throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), "合同附件不能为空");
         } else {
@@ -403,6 +404,17 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             rentContractFileService.insertBatch(fileList);
         }
 
+        // 文件附件处理
+        if (null != dto.getDocList() && dto.getDocList().size() > 0) {
+            List<RentContractFileEntity> fileList = ConvertUtils.sourceToTarget(dto.getDocList(), RentContractFileEntity.class);
+            fileList.forEach(item -> {
+                item.setReferenceId(contractId);
+                item.setFileType(NumConstant.FOUR_STR);
+                item.setCustomerId(loginUserUtil.getLoginUserCustomerId());
+            });
+            rentContractFileService.insertBatch(fileList);
+        }
+
         // 中介资料处理
         if (null != dto.getAgencyImgList() && dto.getAgencyImgList().size() > 0) {
             List<RentContractFileEntity> fileList = ConvertUtils.sourceToTarget(dto.getAgencyImgList(), RentContractFileEntity.class);
@@ -413,6 +425,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             });
             rentContractFileService.insertBatch(fileList);
         }
+
     }
 
 }