From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java | 32 +++++++++++++++++++++++++++-----
1 files changed, 27 insertions(+), 5 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
index 31d7406..af3164f 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/UserHouseLabelServiceImpl.java
@@ -17,19 +17,22 @@
package org.springblade.modules.house.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.house.dto.UserHouseLabelDTO;
import org.springblade.modules.house.entity.UserHouseLabelEntity;
-import org.springblade.modules.house.vo.HouseholdLabelVO;
+import org.springblade.modules.house.excel.UserHouseLabelExcel;
import org.springblade.modules.house.mapper.UserHouseLabelMapper;
import org.springblade.modules.house.service.IUserHouseLabelService;
+import org.springblade.modules.house.vo.HouseholdLabelVO;
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;
import java.util.List;
+import java.util.Objects;
/**
* 住户-标签 服务实现类
@@ -51,6 +54,7 @@
/**
* 住户-标签 自定义新增或修改
+ *
* @param householdLabel
* @return
*/
@@ -61,10 +65,10 @@
householdLabel.setLabelName(labelEntity.getLabelName());
// 判断同一个住户同一个标签是否已存在，已存在则更新，不存在则新增
QueryWrapper<UserHouseLabelEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("household_id",householdLabel.getHouseholdId())
- .eq("label_id",householdLabel.getLabelId());
+ queryWrapper.eq("household_id", householdLabel.getHouseholdId())
+ .eq("label_id", householdLabel.getLabelId());
UserHouseLabelEntity one = getOne(queryWrapper);
- if (null != one){
+ if (null != one) {
householdLabel.setId(one.getId());
// 更新
return updateById(householdLabel);
@@ -78,4 +82,22 @@
List<Integer> userLabelList = baseMapper.getUserLabelList(userHouseLabelDTO);
return userLabelList;
}
+
+ @Override
+ public void importUserHouseLabel(List<UserHouseLabelExcel> data, Boolean isCovered) {
+ data.forEach(houseHoldExcel -> {
+ UserHouseLabelEntity userHouseLabelEntity = Objects.requireNonNull(BeanUtil.copy(houseHoldExcel, UserHouseLabelEntity.class));
+ this.save(userHouseLabelEntity);
+ });
+ }
+
+ @Override
+ public IPage<HouseholdLabelVO> statisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel) {
+ return page.setRecords(baseMapper.statisticalLabels(page, householdLabel));
+ }
+
+ @Override
+ public IPage<HouseholdLabelVO> getCommunityStatisticalLabels(IPage<HouseholdLabelVO> page, HouseholdLabelVO householdLabel) {
+ return page.setRecords(baseMapper.getCommunityStatisticalLabels(page, householdLabel));
+ }
}
--
Gitblit v1.9.3