java/xizang.git

			@@ -4,6 +4,7 @@
			import com.ruoyi.common.basic.PageInfo;
			import com.ruoyi.common.constant.DictConstants;
			import com.ruoyi.common.utils.DictUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.mapper.TContractMapper;
			import com.ruoyi.system.mapper.THouseMapper;
			import com.ruoyi.system.model.TContract;
			@@ -56,7 +57,7 @@
			PageInfo<HouseVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
			List<HouseVO> list = this.baseMapper.userHistoryList(query,pageInfo);
			for (HouseVO houseVO : list) {
			houseVO.setTenantAttributes(DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes()));
			houseVO.setTenantAttributes(StringUtils.isNotEmpty(houseVO.getTenantAttributes())?DictUtils.getDictLabel(DictConstants.DICT_TYPE_TENANT_ATTRIBUTE,houseVO.getTenantAttributes()):"");
			}
			pageInfo.setRecords(list);
			return pageInfo;

			@@ -58,7 +58,7 @@
			t2.id as tenantId,
			t2.id_card as idCard,
			t2.bank_number as bankNumber,
			t2.mail_address as mailAddress,
			t2.mail_address as mailAddress
			from t_contract t1
			left join t_tenant t2 on t1.tenant_id = t2.id
			LEFT JOIN t_house t3 on t3.id = t1.house_id

	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/THouseServiceImpl.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/resources/mapper/system/THouseMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史