Browse Source

[合同][修改][修改租赁记租开始日期]

release_toaliyun_real
luozukai 7 years ago
parent
commit
aa38114e4b
2 changed files with 6 additions and 7 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java
  2. +5
    -6
      mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxPropertyContractController.java View File

@@ -69,7 +69,7 @@ public class WxPropertyContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxPropertyContractController::updateRentStartTime");
Integer rentStartType = wxPropertyContract.getRentStartType();
wxPropertyContract = wxPropertyContractMapper.selectByPrimaryKey(wxPropertyContract.getId());
if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){
if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){
wxPropertyContract.setRentalStartDate(wxPropertyContract.getStartDate());
}
MallUserInfo user = getUser();


+ 5
- 6
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java View File

@@ -87,9 +87,8 @@ public class WxRentContractController extends BaseController {

MallUserInfo user = getUser();
wxRentContract.setTenantId(user.getTenantId());

wxRentContract.setAdjustPeriodHandle();
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
return wxRentContractService.save(wxRentContract, user.getId(),user.getName());
@@ -101,7 +100,7 @@ public class WxRentContractController extends BaseController {
logger.debug("[" + getIpAddr() + "] WxRentContractController::updateRentStartTime");
Integer rentStartType = wxRentContract.getRentStartType();
wxRentContract = wxRentContractMapper.selectByPrimaryKey(wxRentContract.getId());
if(rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){
if(rentStartType!=null && rentStartType.equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
MallUserInfo user = getUser();
@@ -119,7 +118,7 @@ public class WxRentContractController extends BaseController {
wxRentContract.setTenantId(user.getTenantId());
wxRentContract.setAdjustPeriodHandle();
wxRentContract.setRentPriceHandle();
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
return wxRentContractService.update(wxRentContract, user.getId(),user.getName());
@@ -139,7 +138,7 @@ public class WxRentContractController extends BaseController {
wxRentContract.setAdjustPeriodHandle();
wxRentContract.setRentPriceHandle();

if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
if(wxRentContract.getRentStartType()!=null &&wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
return wxRentContractService.update(wxRentContract, user.getId(),user.getName());
@@ -153,7 +152,7 @@ public class WxRentContractController extends BaseController {
wxRentContract.setTenantId(user.getTenantId());
wxRentContract.setAdjustPeriodHandle();
wxRentContract.setRentPriceHandle();
if(wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
if(wxRentContract.getRentStartType()!=null && wxRentContract.getRentStartType().equals(EnumRentStartType.STARTTIME.getCode())){
wxRentContract.setRentalStartDate(wxRentContract.getStartDate());
}
return wxRentContractService.updateFile(wxRentContract, user.getId(),user.getName());


Loading…
Cancel
Save