From 962126eae48114f135b55b35aab2ff860e7b39d0 Mon Sep 17 00:00:00 2001 From: luozukai Date: Tue, 4 Jun 2019 15:01:00 +0800 Subject: [PATCH] =?UTF-8?q?[=E5=90=88=E5=90=8C][=E4=BF=AE=E6=94=B9][?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A7=9F=E8=B5=81=E8=AE=B0=E7=A7=9F=E5=BC=80?= =?UTF-8?q?=E5=A7=8B=E6=97=A5=E6=9C=9F]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WxPropertyContractController.java | 21 ++++++++++ .../contract/WxRentContractController.java | 35 ++++++++++++++++- .../com/iformall/enums/EnumRentStartType.java | 38 +++++++++++++++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java 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 f628989e0..69c5861c0 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java @@ -7,6 +7,9 @@ import com.iformall.controller.base.BaseController; import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxBillProperty; import com.iformall.domain.po.WxPropertyContract; +import com.iformall.domain.po.WxRentContract; +import com.iformall.enums.EnumRentStartType; +import com.iformall.mapper.WxPropertyContractMapper; import com.iformall.service.WxBillPropertyService; import com.iformall.service.WxPropertyContractService; import io.swagger.annotations.ApiImplicitParam; @@ -30,6 +33,8 @@ public class WxPropertyContractController extends BaseController { private WxPropertyContractService wxPropertyContractService; @Autowired private WxBillPropertyService wxBillPropertyService; + @Autowired + private WxPropertyContractMapper wxPropertyContractMapper; private Logger logger = LoggerFactory.getLogger(WxPropertyContractController.class); @@ -58,6 +63,22 @@ public class WxPropertyContractController extends BaseController { return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); } + @PostMapping("updateRentStartTime") + @SystemControllerLog(description = "物业合同-更新租赁开始日期") + public ResultData updateRentStartTime(@RequestBody WxPropertyContract wxPropertyContract) { + logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime"); + Integer rentStartType = wxPropertyContract.getRentStartType(); + wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId()); + if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate()); + } + MallUserInfo user = getUser(); + wxPropertyContract.setTenantId(user.getTenantId()); + wxPropertyContract.setAdjustPeriodHandle(); + return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); + } + + @PostMapping("update") @SystemControllerLog(description = "物业合同-修改") public ResultData update(@RequestBody WxPropertyContract wxPropertyContract) { diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java index dcabe1272..d1c8bc890 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java @@ -12,6 +12,8 @@ import com.iformall.domain.po.WxRentContract; import com.iformall.domain.po.WxShop; import com.iformall.enums.EnumRentContractAdjustPeriod; import com.iformall.enums.EnumRentShopType; +import com.iformall.enums.EnumRentStartType; +import com.iformall.mapper.WxRentContractMapper; import com.iformall.service.WxBillRentService; import com.iformall.service.WxPayAccountBillService; import com.iformall.service.WxRentContractService; @@ -46,6 +48,8 @@ public class WxRentContractController extends BaseController { private WxPayAccountBillService payAccountBillService; @Autowired private WxShopService wxShopService; + @Autowired + private WxRentContractMapper wxRentContractMapper; @GetMapping("getDateDiff") @ApiImplicitParams({ @@ -85,9 +89,28 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.save(wxRentContract, user.getId(),user.getName()); } + @PostMapping("updateRentStartTime") + @SystemControllerLog(description = "租赁合同-更新租赁开始日期") + public ResultData updateRentStartTime(@RequestBody WxRentContract wxRentContract) { + logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime"); + Integer rentStartType = wxRentContract.getRentStartType(); + wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId()); + if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } + MallUserInfo user = getUser(); + wxRentContract.setTenantId(user.getTenantId()); + wxRentContract.setAdjustPeriodHandle(); + wxRentContract.setRentPriceHandle(); + return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); + } + @PostMapping("update") @SystemControllerLog(description = "租赁合同-更新") public ResultData update(@RequestBody WxRentContract wxRentContract) { @@ -96,6 +119,9 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); } @@ -112,6 +138,10 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.update(wxRentContract, user.getId(),user.getName()); } @@ -123,6 +153,9 @@ public class WxRentContractController extends BaseController { wxRentContract.setTenantId(user.getTenantId()); wxRentContract.setAdjustPeriodHandle(); wxRentContract.setRentPriceHandle(); + if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){ + wxRentContract.setRentalStartDate(wxRentContract.getStartDate()); + } return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName()); } @@ -147,7 +180,6 @@ public class WxRentContractController extends BaseController { } @RequestMapping("/download") - @SystemControllerLog(description = "租赁合同-下载") public void download(HttpServletRequest request, HttpServletResponse response){ logger.debug("[" + getIpAddr() + "] WxRentContractController::download"); wxRentContractService.download(request,response,getTenantId()); @@ -263,3 +295,4 @@ public class WxRentContractController extends BaseController { } + diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java b/mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java new file mode 100644 index 000000000..31bbe55d7 --- /dev/null +++ b/mallinkService/src/main/java/com/iformall/enums/EnumRentStartType.java @@ -0,0 +1,38 @@ +package com.iformall.enums; + +/** + * Created by Stormeye on 2018/08/09. + */ +public enum EnumRentStartType { + + + STARTTIME(2, "记租开始日期"), + RENTTIME(1, "租赁开始日期"), + ; + + public static EnumRentStartType getEnum(Integer code) { + for (EnumRentStartType value : values()) { + if (value.getCode().equals(code)) { + return value; + } + } + return null; + } + + private Integer code; + private String message; + + EnumRentStartType(Integer code, String message) { + this.code = code; + this.message = message; + } + + public Integer getCode() { + return code; + } + + public String getMessage() { + return message; + } +} +