From 6555f5b5bdec376aa93a77ed1a4c18ee58610aa6 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 19 May 2022 10:45:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=90=8C=E4=BF=9D=E5=AD=98=E4=B8=8D?=
 =?UTF-8?q?=E5=9C=A8=E8=BF=94=E5=9B=9E=E9=94=99=E8=AF=AF=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/controller/RentContractInfoController.java       | 3 ++-
 .../modules/rent/service/RentContractInfoService.java     | 2 +-
 .../rent/service/impl/RentContractInfoServiceImpl.java    | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java
index 64826f9..3173018 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractInfoController.java
@@ -50,7 +50,8 @@ public class RentContractInfoController {
     public Result save(@RequestBody RentContractInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        return rentContractInfoService.save(dto);
+        rentContractInfoService.save(dto);
+        return new Result();
     }
 
     @NoRepeatSubmit
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java
index 5a552ea..64d9e37 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/RentContractInfoService.java
@@ -55,7 +55,7 @@ public interface RentContractInfoService extends BaseService<RentContractInfoEnt
      * @author generator
      * @date 2022-04-22
      */
-    Result save(RentContractInfoDTO dto);
+    void save(RentContractInfoDTO dto);
 
     /**
      * 审核
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 9b22c46..66a9eed 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
@@ -160,11 +160,12 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result save(RentContractInfoDTO dto) {
+    public void save(RentContractInfoDTO dto) {
         RentContractInfoEntity entity = ConvertUtils.sourceToTarget(dto, RentContractInfoEntity.class);
         entity.setCustomerId(loginUserUtil.getLoginUserCustomerId());
         insert(entity);
-        return updateTenantAndFile(entity.getId(), dto);
+        // 处理租客信息和合同信息
+        updateTenantAndFile(entity.getId(), dto);
     }
 
     @Override
@@ -247,7 +248,7 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
-    private Result updateTenantAndFile(String contractId, RentContractInfoDTO dto) {
+    private void updateTenantAndFile(String contractId, RentContractInfoDTO dto) {
         Map<String, Object> params = new HashMap<>(8);
         params.put("contractId", contractId);
         params.put("referenceId", contractId);
@@ -330,7 +331,6 @@ public class RentContractInfoServiceImpl extends BaseServiceImpl<RentContractInf
             });
             rentContractFileService.insertBatch(fileList);
         }
-        return new Result();
     }
 
 }