From c9d9098c15baafac23acc8ecc995aded073cd259 Mon Sep 17 00:00:00 2001 From: gongbiao Date: Thu, 20 Jun 2019 11:34:05 +0800 Subject: [PATCH] =?UTF-8?q?[BUG][=E4=BF=AE=E6=94=B9][=E7=89=A9=E4=B8=9A?= =?UTF-8?q?=E4=BF=9D=E5=AD=98=E9=97=AE=E9=A2=98]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 23 +++++-------------- .../service/WxPropertyContractService.java | 2 +- .../impl/WxPropertyContractServiceImpl.java | 2 +- 3 files changed, 8 insertions(+), 19 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java index d40bf7d3b..be0b06fa4 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.util.Date; import java.util.Map; /** @@ -60,12 +59,11 @@ public class WxPropertyContractController extends BaseController { MallUserInfo user = getUser(); wxPropertyContract.setTenantId(user.getTenantId()); wxPropertyContract.setAdjustPeriodHandle(); - Date oldDate = wxPropertyContract.getRentalStartDate(); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); } - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); } @PostMapping("updateRentStartTime") @@ -74,7 +72,6 @@ public class WxPropertyContractController extends BaseController { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); - Date oldDate = wxPropertyContract.getRentalStartDate(); if(wxPropertyContract.getRentStartType()!=null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ propertyContract.setRentalStartDate(propertyContract.getStartDate()); @@ -84,7 +81,7 @@ public class WxPropertyContractController extends BaseController { propertyContract.setTenantId(user.getTenantId()); propertyContract.setAdjustPeriodHandle(); propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); - return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate); + return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); } @@ -92,20 +89,12 @@ public class WxPropertyContractController extends BaseController { @SystemControllerLog(description = "物业合同-修改") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { logger.debug("[" + getIpAddr() + "] WxPropertyContractController::update"); - WxPropertyContract propertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); - propertyContract.setRentalStartDate(wxPropertyContract.getRentalStartDate()); - Date oldDate = wxPropertyContract.getRentalStartDate(); - - if (wxPropertyContract.getRentStartType() != null && wxPropertyContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())) { - propertyContract.setRentalStartDate(propertyContract.getStartDate()); - } - MallUserInfo user = getUser(); - propertyContract.setTenantId(user.getTenantId()); - propertyContract.setAdjustPeriodHandle(); - propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); + wxPropertyContract.setTenantId(user.getTenantId()); + wxPropertyContract.setAdjustPeriodHandle(); //第三步提交 SWITCH - return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + } @GetMapping("/del") diff --git a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java index 64143f7bf..c73d99534 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxPropertyContractService.java @@ -40,7 +40,7 @@ public interface WxPropertyContractService { * @param oldDate * @return */ - ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate); + ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName); /** * 根据Id删除实体 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java index 8cfab0d5f..5adf8153d 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxPropertyContractServiceImpl.java @@ -211,7 +211,7 @@ public class WxPropertyContractServiceImpl implements WxPropertyContractService @Override @Transactional(rollbackFor = {Exception.class}) - public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName, Date oldDate) { + public ResultData saveOrUpdate(WxPropertyContract record, Long userId, String userName) { // 保存调整金额(预账单调整) boolean haspreview = false; if(!CollectionUtils.isEmpty(record.getPreviewBillRentList())){