From c10d6358b9f014375a13821465bc978d0c0da22e Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Wed, 29 May 2024 17:17:08 +0800
Subject: [PATCH] 通过E呼即办数据统计

---
 src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java |   16 +++++++++++-----
 1 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
index 13f6e01..ea3c954 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java
@@ -19,10 +19,12 @@
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springblade.modules.house.entity.HouseLabelEntity;
-import org.springblade.modules.house.vo.HouseLabelVO;
+import org.springblade.modules.house.vo.UserHouseLabelVO;
 import org.springblade.modules.house.mapper.HouseLabelMapper;
 import org.springblade.modules.house.service.IHouseLabelService;
-import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.label.entity.LabelEntity;
+import org.springblade.modules.label.service.ILabelService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -35,8 +37,11 @@
 @Service
 public class HouseLabelServiceImpl extends ServiceImpl<HouseLabelMapper, HouseLabelEntity> implements IHouseLabelService {
 
+	@Autowired
+	private ILabelService labelService;
+
 	@Override
-	public IPage<HouseLabelVO> selectHouseLabelPage(IPage<HouseLabelVO> page, HouseLabelVO houseLabel) {
+	public IPage<UserHouseLabelVO> selectHouseLabelPage(IPage<UserHouseLabelVO> page, UserHouseLabelVO houseLabel) {
 		return page.setRecords(baseMapper.selectHouseLabelPage(page, houseLabel));
 	}
 
@@ -48,14 +53,15 @@
 	@Override
 	public boolean saveOrUpdateHouseLabel(HouseLabelEntity houseLabel) {
 		// 查询标签名称
-		HouseLabelEntity labelEntity = getById(houseLabel.getLabelId());
+		LabelEntity labelEntity = labelService.getById(houseLabel.getLabelId());
 		houseLabel.setLabelName(labelEntity.getLabelName());
 		// 判断同一个房屋同一个标签是否已存在,已存在则更新,不存在则新增
 		QueryWrapper<HouseLabelEntity> queryWrapper = new QueryWrapper<>();
 		queryWrapper.eq("house_code",houseLabel.getHouseCode())
-					.eq("label_id",houseLabel.getLabelId());
+			.eq("label_id",houseLabel.getLabelId());
 		HouseLabelEntity one = getOne(queryWrapper);
 		if (null != one){
+			houseLabel.setId(one.getId());
 			// 更新
 			return updateById(houseLabel);
 		}

--
Gitblit v1.9.3