|
|
|
@@ -20,6 +20,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletResponse; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
/** |
|
|
|
@@ -59,11 +60,12 @@ 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()); |
|
|
|
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); |
|
|
|
} |
|
|
|
|
|
|
|
@PostMapping("updateRentStartTime") |
|
|
|
@@ -72,6 +74,7 @@ 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()); |
|
|
|
@@ -81,7 +84,7 @@ public class WxPropertyContractController extends BaseController { |
|
|
|
propertyContract.setTenantId(user.getTenantId()); |
|
|
|
propertyContract.setAdjustPeriodHandle(); |
|
|
|
propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); |
|
|
|
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName()); |
|
|
|
return wxPropertyContractService.saveOrUpdate(propertyContract, user.getId(), user.getName(), oldDate); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@@ -89,11 +92,20 @@ 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(); |
|
|
|
wxPropertyContract.setTenantId(user.getTenantId()); |
|
|
|
wxPropertyContract.setAdjustPeriodHandle(); |
|
|
|
propertyContract.setTenantId(user.getTenantId()); |
|
|
|
propertyContract.setAdjustPeriodHandle(); |
|
|
|
propertyContract.setRentStartType(wxPropertyContract.getRentStartType()); |
|
|
|
//第三步提交 SWITCH |
|
|
|
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName()); |
|
|
|
return wxPropertyContractService.saveOrUpdate(wxPropertyContract, user.getId(), user.getName(), oldDate); |
|
|
|
} |
|
|
|
|
|
|
|
@GetMapping("/del") |
|
|
|
|