ruoyi-applet/src/main/java/com/ruoyi/web/controller/api/TBillController.java
@@ -90,6 +90,11 @@ billVO.setHouse(houseService.getById(contract.getHouseId())); billVO.setMonthRent(contract.getMonthRent()); billVO.setPayType(contract.getPayType()); billVO.setDeposit(contract.getDeposit()); billVO.setPartyOnePerson(contract.getPartyOnePerson()); billVO.setPartyOnePhone(contract.getPartyOnePhone()); billVO.setConcatStartTime(contract.getStartTime()); billVO.setConcatEndTime(contract.getEndTime()); }); billVO.setBillType(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BILL_TYPE,billVO.getBillType())); billVO.setPayFeesStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_PAY_FEES_STATUS,billVO.getPayFeesStatus())); ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TContractServiceImpl.java
@@ -118,6 +118,7 @@ CheckAcceptRecordVO checkAcceptRecordVO = new CheckAcceptRecordVO(); TCheckAcceptRecord tCheckAcceptRecord = checkAcceptRecordMapper.selectOne(new LambdaQueryWrapper<TCheckAcceptRecord>() .eq(TCheckAcceptRecord::getContractId, id)); if (tCheckAcceptRecord==null)return checkAcceptRecordVO; BeanUtils.copyProperties(tCheckAcceptRecord,checkAcceptRecordVO); THouse tHouse = houseMapper.selectById(tCheckAcceptRecord.getHouseId()); tHouse.setLeaseStatus(DictUtils.getDictLabel(DictConstants.DICT_TYPE_LEASE_STATUS,tHouse.getLeaseStatus())); ruoyi-system/src/main/java/com/ruoyi/system/vo/TBillVO.java
@@ -1,6 +1,7 @@ package com.ruoyi.system.vo; import com.baomidou.mybatisplus.annotation.TableField; import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.model.TBill; import com.ruoyi.system.model.TBillDetail; import com.ruoyi.system.model.THouse; @@ -9,6 +10,7 @@ import lombok.Data; import java.math.BigDecimal; import java.time.LocalDateTime; import java.util.List; @Data @@ -26,4 +28,18 @@ @ApiModelProperty(value = "租金支付方式 月付 季付 年付") private String payType; @ApiModelProperty(value = "押金") private BigDecimal deposit; @ApiModelProperty(value = "甲方联系人") private String partyOnePerson; @ApiModelProperty(value = "甲方联系方式") private String partyOnePhone; @ApiModelProperty(value = "合同开始时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime concatStartTime; @ApiModelProperty(value = "合同结束时间") @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private LocalDateTime concatEndTime; }