From 78f9fe6f8348873473597ea5ed00c1725c30ad56 Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 28 Apr 2022 14:51:37 +0800
Subject: [PATCH] =?UTF-8?q?=20=E7=A7=BB=E9=99=A4=E5=8E=9F=E5=9B=A0?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../rent/controller/RentContractFileController.java | 13 ++++++-------
 .../rent/controller/RentTenantInfoController.java   | 13 ++++++-------
 .../rent/service/impl/RentBlacklistServiceImpl.java |  2 +-
 3 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java
index 0511f7f..7ea49af 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentContractFileController.java
@@ -34,20 +34,20 @@ public class RentContractFileController {
     private RentContractFileService rentContractFileService;
 
     @RequestMapping("page")
-    public Result<PageData<RentContractFileDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<RentContractFileDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<RentContractFileDTO> page = rentContractFileService.page(params);
         return new Result<PageData<RentContractFileDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<RentContractFileDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<RentContractFileDTO> get(@PathVariable("id") String id) {
         RentContractFileDTO data = rentContractFileService.get(id);
         return new Result<RentContractFileDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody RentContractFileDTO dto){
+    public Result save(@RequestBody RentContractFileDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         rentContractFileService.save(dto);
@@ -56,7 +56,7 @@ public class RentContractFileController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody RentContractFileDTO dto){
+    public Result update(@RequestBody RentContractFileDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         rentContractFileService.update(dto);
@@ -64,7 +64,7 @@ public class RentContractFileController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         rentContractFileService.delete(ids);
@@ -78,5 +78,4 @@ public class RentContractFileController {
     }
 
 
-
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
index ad5d1b2..7fdd761 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/controller/RentTenantInfoController.java
@@ -34,20 +34,20 @@ public class RentTenantInfoController {
     private RentTenantInfoService rentTenantInfoService;
 
     @RequestMapping("page")
-    public Result<PageData<RentTenantInfoDTO>> page(@RequestParam Map<String, Object> params){
+    public Result<PageData<RentTenantInfoDTO>> page(@RequestParam Map<String, Object> params) {
         PageData<RentTenantInfoDTO> page = rentTenantInfoService.page(params);
         return new Result<PageData<RentTenantInfoDTO>>().ok(page);
     }
 
-    @RequestMapping(value = "{id}",method = {RequestMethod.POST,RequestMethod.GET})
-    public Result<RentTenantInfoDTO> get(@PathVariable("id") String id){
+    @RequestMapping(value = "{id}", method = {RequestMethod.POST, RequestMethod.GET})
+    public Result<RentTenantInfoDTO> get(@PathVariable("id") String id) {
         RentTenantInfoDTO data = rentTenantInfoService.get(id);
         return new Result<RentTenantInfoDTO>().ok(data);
     }
 
     @NoRepeatSubmit
     @PostMapping("save")
-    public Result save(@RequestBody RentTenantInfoDTO dto){
+    public Result save(@RequestBody RentTenantInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
         return rentTenantInfoService.save(dto);
@@ -55,7 +55,7 @@ public class RentTenantInfoController {
 
     @NoRepeatSubmit
     @PostMapping("update")
-    public Result update(@RequestBody RentTenantInfoDTO dto){
+    public Result update(@RequestBody RentTenantInfoDTO dto) {
         //效验数据
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
         rentTenantInfoService.update(dto);
@@ -63,7 +63,7 @@ public class RentTenantInfoController {
     }
 
     @PostMapping("delete")
-    public Result delete(@RequestBody String[] ids){
+    public Result delete(@RequestBody String[] ids) {
         //效验数据
         AssertUtils.isArrayEmpty(ids, "id");
         rentTenantInfoService.delete(ids);
@@ -77,5 +77,4 @@ public class RentTenantInfoController {
     }
 
 
-
 }
diff --git a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java
index 6849786..8a2c413 100644
--- a/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java
+++ b/epmet-plugins-module/pli-power-base/pli-power-base-server/src/main/java/com/epmet/plugin/power/modules/rent/service/impl/RentBlacklistServiceImpl.java
@@ -113,7 +113,7 @@ public class RentBlacklistServiceImpl extends BaseServiceImpl<RentBlacklistDao,
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void update(RentBlacklistDTO dto) {
-        dto.setRemoveReason(DateUtils.format(new Date()));
+        dto.setRemoveDate(DateUtils.format(new Date()));
         RentBlacklistEntity entity = ConvertUtils.sourceToTarget(dto, RentBlacklistEntity.class);
         updateById(entity);
         baseDao.deleteBatchIds(Collections.singletonList(entity.getId()));