From f7131c30d3be1558160215a4c33b8daa0a15c7af Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期一, 17 二月 2025 15:53:19 +0800 Subject: [PATCH] 小程序登录 --- ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml | 1 + ruoyi-system/src/main/java/com/ruoyi/system/vo/HouseVO.java | 4 +++- ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java | 2 +- 3 files changed, 5 insertions(+), 2 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 5d59da6..27c399d 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 @@ -56,7 +56,7 @@ PageInfo<HouseVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize()); List<HouseVO> list = this.baseMapper.userHistoryList(query,pageInfo); for (HouseVO houseVO : list) { - houseVO.setBusinessAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_BUSINESS_ATTRIBUTES,houseVO.getBusinessAttributes())); + houseVO.setTenantAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes())); } 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 722a6de..4e74bbb 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 @@ -17,6 +17,8 @@ @ApiModelProperty(value = "房屋id") private String houseId; + @ApiModelProperty(value = "房屋id") + private String tenantId; @ApiModelProperty(value = "租户姓名") private String residentName; @@ -25,7 +27,7 @@ private String phone; @ApiModelProperty(value = "属性") - private String businessAttributes; + private String tenantAttributes; @ApiModelProperty(value = "类型") private String productType; @ApiModelProperty(value = "入住日期") diff --git a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml index d09143d..d822f3d 100644 --- a/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml @@ -55,6 +55,7 @@ t3.room_number as roomNumber, t3.house_area as houseArea, t2.phone as loginAccount, + t2.id as tenantId, t2.id_card as idCard, t2.bank_number as bankNumber, t2.mail_address as mailAddress, -- Gitblit v1.7.1