| | |
|---|
| | | if (contractRentType!=null){ |
|---|
| | | BeanUtils.copyProperties(contractRentType,res); |
|---|
| | | } |
|---|
| | | TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>() |
|---|
| | | .eq(TContract::getHouseId,contract.getHouseId()) |
|---|
| | | .eq(TContract::getStatus, 4) |
|---|
| | | .le(TContract::getStartTime, LocalDateTime.now()) |
|---|
| | | .ge(TContract::getEndTime, LocalDateTime.now())); |
|---|
| | | // TContract oldContract = contractService.getOne(new LambdaQueryWrapper<TContract>() |
|---|
| | | // .eq(TContract::getHouseId,contract.getHouseId()) |
|---|
| | | // .eq(TContract::getStatus, 4) |
|---|
| | | // .le(TContract::getStartTime, LocalDateTime.now()) |
|---|
| | | // .ge(TContract::getEndTime, LocalDateTime.now())); |
|---|
| | | THouse house = houseService.getById(contract.getHouseId()); |
|---|
| | | if (oldContract!=null){ |
|---|
| | | house.setTenantType(oldContract.getPayType()); |
|---|
| | | } |
|---|
| | | house.setTenantType(contract.getPayType()); |
|---|
| | | res.setHouse(house); |
|---|
| | | List<TBill> list = billService.lambdaQuery() |
|---|
| | | .eq(TBill::getContractId, id) |
|---|
