| @@ -553,7 +553,7 @@ public class WxRentContractController extends WxContractBaseController { | |||||
| return new ResultData(Result.ERROR,e.getMessage()); | return new ResultData(Result.ERROR,e.getMessage()); | ||||
| } | } | ||||
| wxRentContractService.updateRentContractStatus(wxRentContract.getId()); | |||||
| wxRentContractService.updateRentContractStatus(wxRentContract.getId(),false); | |||||
| if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { | if(contract.getOperationType().intValue() == EnumContractOperationType.WHOLE.getCode().intValue()) { | ||||
| wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId()); | wxPropertyContractService.updatePropertyContractStatus(wxRentContract.getPropertyId()); | ||||
| } | } | ||||
| @@ -68,7 +68,7 @@ public interface WxRentContractService { | |||||
| ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate,boolean writeComplate); | ResultData updateFile(WxRentContract wxRentContract, Long userId,String userName,Date oldRentStartDate,boolean writeComplate); | ||||
| ResultData updateRentContractStatus(Long id); | |||||
| ResultData updateRentContractStatus(Long id,boolean buildPropertyBill); | |||||
| List<Long> getShopIds(WxRentContract record) ; | List<Long> getShopIds(WxRentContract record) ; | ||||
| @@ -216,7 +216,7 @@ public class WxFlowServiceImpl implements WxFlowService { | |||||
| } | } | ||||
| //如果审批完成 | //如果审批完成 | ||||
| }else if (EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | }else if (EnumRentContractAppStatus.FINISH.getCode().intValue() == applyStatus.intValue()) { | ||||
| wxRentContractService.updateRentContractStatus(bsId); | |||||
| wxRentContractService.updateRentContractStatus(bsId,false); | |||||
| if (isrentproperty) { | if (isrentproperty) { | ||||
| wxPropertyContractService.updatePropertyContractStatus(propetyId); | wxPropertyContractService.updatePropertyContractStatus(propetyId); | ||||
| } | } | ||||
| @@ -1635,7 +1635,7 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData updateRentContractStatus(Long id) { | |||||
| public ResultData updateRentContractStatus(Long id,boolean buildProperyBill) { | |||||
| if (id == null) { | if (id == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| } | } | ||||
| @@ -1678,7 +1678,10 @@ public class WxRentContractServiceImpl implements WxRentContractService { | |||||
| //押金 | //押金 | ||||
| buildDeposit( null, id); | buildDeposit( null, id); | ||||
| } | } | ||||
| updatePropertyPreviewBill(record); | |||||
| //一起建立物业账单 | |||||
| if (buildProperyBill) { | |||||
| updatePropertyPreviewBill(record); | |||||
| } | |||||
| //作废合同 | //作废合同 | ||||
| //updateInvalidContract(id); | //updateInvalidContract(id); | ||||
| } | } | ||||