Преглед изворни кода

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

release_toaliyun_real
luozukai пре 7 година
родитељ
комит
aa38114e4b
2 измењених фајлова са 6 додато и 7 уклоњено
  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 Прегледај датотеку

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


+ 5
- 6
mallinkAdmin/src/main/java/com/iformall/controller/contract/WxRentContractController.java Прегледај датотеку

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


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

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


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


Loading…
Откажи
Сачувај