|
|
|
@@ -196,7 +196,8 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
|
|
|
|
if (cure.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || |
|
|
|
(cure.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() |
|
|
|
&& cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue())) { |
|
|
|
&& (cure.getApplyStatus().intValue()== EnumRentContractAppStatus.REJECT.getCode().intValue() || |
|
|
|
cure.getApplyStatus().intValue()== EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { |
|
|
|
if(StringUtils.isBlank(rentContract.getBusDiscountRatio())){ |
|
|
|
rentContract.setBusDiscountTime(new Integer(0)); |
|
|
|
} |
|
|
|
@@ -336,7 +337,8 @@ public class WxRentContractController extends WxContractBaseController { |
|
|
|
} |
|
|
|
if (contract.getStatus().intValue() == EnumRentContractStatus.DRAFT.getCode().intValue() || |
|
|
|
(contract.getStatus().intValue() == EnumRentContractStatus.PERFORMANCE.getCode().intValue() |
|
|
|
&& contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue())) { |
|
|
|
&& (contract.getApplyStatus().intValue() == EnumRentContractAppStatus.REJECT.getCode().intValue() || |
|
|
|
contract.getApplyStatus().intValue() == EnumRentContractAppStatus.SETBACK.getCode().intValue()))) { |
|
|
|
contract.setStatus(EnumRentContractStatus.INVALID.getCode()); |
|
|
|
contract.setUpdatetime(new Date()); |
|
|
|
return wxRentContractService.updateRentContract(contract); |
|
|
|
|