From 0b10d9aa3e540062ecde0bc5f01812a0a355849f Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 26 May 2022 11:01:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/plugin/power/dto/rent/RentContractInfoDTO.java | 5 +++++
 .../com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java   | 5 +++++
 .../pli-power-base/pli-power-base-server/pom.xml             | 5 +++++
 .../power/modules/rent/entity/RentContractInfoEntity.java    | 5 +++++
 .../power/modules/rent/entity/RentTenantInfoEntity.java      | 5 +++++
 .../rent/service/impl/RentContractInfoServiceImpl.java       | 2 +-
 .../src/main/resources/mapper/rent/RentTenantInfoDao.xml     | 3 ++-
 7 files changed, 28 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/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 1a8a3ee..c9a3198 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
@@ -146,6 +146,11 @@ public class RentContractInfoDTO implements Serializable {
     @NotBlank(message = "承租人手机不能为空")
 	private String lesseeMobile;
 
+    /**
+     * 承租人单位
+     */
+    private String lesseeUnit;
+
     /**
      * 签署日期
      */
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
index 772ddf2..700b825 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-client/src/main/java/com/epmet/plugin/power/dto/rent/RentTenantInfoDTO.java
@@ -97,6 +97,11 @@ public class RentTenantInfoDTO implements Serializable {
      */
     private String nation;
 
+    /**
+     * 工作单位
+     */
+    private String unit;
+
     /**
      * 头像列表
      */
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
index adfd171..4a2aa92 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/pom.xml
@@ -83,6 +83,11 @@
             <version>RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>net.coobird</groupId>
+            <artifactId>thumbnailator</artifactId>
+            <version>0.4.8</version>
+        </dependency>
     </dependencies>
 
     <build>
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java
index bb6f79a..5acefe5 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentContractInfoEntity.java
@@ -126,6 +126,11 @@ public class RentContractInfoEntity extends BaseEpmetEntity {
      */
 	private String lesseeMobile;
 
+	/**
+	 * 承租人单位
+	 */
+	private String lesseeUnit;
+
     /**
      * 签署日期
      */
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
index e45aefb..f235ed5 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/entity/RentTenantInfoEntity.java
@@ -84,6 +84,11 @@ public class RentTenantInfoEntity extends BaseEpmetEntity {
 	 */
 	private String nation;
 
+	/**
+	 * 工作单位
+	 */
+	private String unit;
+
 	/**
 	 * 头像列表
 	 */
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..5b18087 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
@@ -320,7 +320,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
     public void update(RentContractInfoDTO dto) {
         RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
         updateById(entity);
-        updateTenantAndFile(entity.getId(), dto);
+//        updateTenantAndFile(entity.getId(), dto);
     }
 
     @Override
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
index b355a83..1e9611e 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/resources/mapper/rent/RentTenantInfoDao.xml
@@ -47,7 +47,8 @@
         UPDATED_TIME,
         POLITICAL_STATUS,
         IS_MILITARY,
-        NATION
+        NATION,
+        UNIT
         FROM
         pli_rent_tenant_info
         WHERE