From acf2bdafdfa2fb1fe423d0700950c3ddd53c481b Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 14 Nov 2023 19:36:55 +0800
Subject: [PATCH] 标签，房屋，住户管理
---
src/main/java/org/springblade/modules/house/service/impl/HouseLabelServiceImpl.java | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 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..82a76e3 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
@@ -18,11 +18,13 @@
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.entity.UserHouseLabelEntity;
import org.springblade.modules.house.vo.HouseLabelVO;
-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.house.mapper.UserHouseLabelMapper;
+import org.springblade.modules.house.service.IUserHouseLabelService;
+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;
@@ -33,7 +35,10 @@
* @since 2023-10-28
*/
@Service
-public class HouseLabelServiceImpl extends ServiceImpl<HouseLabelMapper, HouseLabelEntity> implements IHouseLabelService {
+public class HouseLabelServiceImpl extends ServiceImpl<UserHouseLabelMapper, UserHouseLabelEntity> implements IUserHouseLabelService {
+
+ @Autowired
+ private ILabelService labelService;
@Override
public IPage<HouseLabelVO> selectHouseLabelPage(IPage<HouseLabelVO> page, HouseLabelVO houseLabel) {
@@ -46,16 +51,17 @@
* @return
*/
@Override
- public boolean saveOrUpdateHouseLabel(HouseLabelEntity houseLabel) {
+ public boolean saveOrUpdateHouseLabel(UserHouseLabelEntity houseLabel) {
// 查询标签名称
- HouseLabelEntity labelEntity = getById(houseLabel.getLabelId());
+ LabelEntity labelEntity = labelService.getById(houseLabel.getLabelId());
houseLabel.setLabelName(labelEntity.getLabelName());
// 判断同一个房屋同一个标签是否已存在，已存在则更新，不存在则新增
- QueryWrapper<HouseLabelEntity> queryWrapper = new QueryWrapper<>();
+ QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
queryWrapper.eq("house_code",houseLabel.getHouseCode())
.eq("label_id",houseLabel.getLabelId());
- HouseLabelEntity one = getOne(queryWrapper);
+ UserHouseLabelEntity one = getOne(queryWrapper);
if (null != one){
+ houseLabel.setId(one.getId());
// 更新
return updateById(houseLabel);
}
--
Gitblit v1.9.3