From e7c9817ea941cbba5391bd2f9155c1bbb71ff53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 07 三月 2025 18:45:58 +0800
Subject: [PATCH] 权限
---
ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 1 +
ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java | 2 ++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java | 2 +-
3 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
index a2a49d9..259962e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java
@@ -62,7 +62,7 @@
List<HouseVO> list = this.baseMapper.userHistoryList(query,pageInfo);
for (HouseVO houseVO : list) {
houseVO.setTenantAttributes(StringUtils.isNotEmpty(houseVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes()):"");
- houseVO.setProductType(StringUtils.isNotEmpty(houseVO.getProductType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,houseVO.getProductType()):"");
+ houseVO.setProductType(StringUtils.isNotEmpty(houseVO.getTenantType())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_TYPE,houseVO.getTenantType()):"");
}
pageInfo.setRecords(list);
return pageInfo;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
index 4e74bbb..a12cadc 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java
@@ -30,6 +30,8 @@
private String tenantAttributes;
@ApiModelProperty(value = "类型")
private String productType;
+ @ApiModelProperty(value = "类型")
+ private String tenantType;
@ApiModelProperty(value = "入住日期")
@JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
private LocalDateTime startTime;
diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
index bbb5742..47b75b6 100644
--- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml
@@ -70,6 +70,7 @@
t3.room_number as roomNumber,
t3.house_area as houseArea,
t2.phone as loginAccount,
+ t2.tenant_type as tenantType,
t2.id as tenantId,
t2.id_card as idCard,
t2.bank_number as bankNumber,
--
Gitblit v1.7.1