From f8d1143ef6cfbbaaebe3b25efa24ee19c9ea61c8 Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 10 Jan 2024 16:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 41 ++++++++++++++++++++++++++++++-----------
1 files changed, 30 insertions(+), 11 deletions(-)
diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 138196f..a15ffa4 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -50,6 +50,7 @@
import org.springframework.util.StopWatch;
import java.util.*;
+import java.util.stream.Collectors;
/**
* 住户 服务实现类
@@ -79,22 +80,11 @@
public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
StopWatch stopWatch = new StopWatch();
stopWatch.start();
-// doInsert();
-// 执行业务等
Dept dept = deptService.getById(AuthUtil.getDeptId());
if (null!=dept){
household.setRegionCode(dept.getRegionCode());
}
List<HouseholdVO> householdVOS = baseMapper.selectHouseholdPage(page, household);
- // 遍历
- // for (HouseholdVO householdVO : householdVOS) {
- // // 设置对应的网格名称
- // GridVO gridVO = gridService.getGridDetailByHouseCode(householdVO.getHouseCode());
- // if (null!= gridVO){
- // householdVO.setGridName(gridVO.getGridName());
- // }
- // }
- // 返回
stopWatch.stop();
System.out.println("selectHouseholdPage:" + stopWatch.getTotalTimeMillis());
return page.setRecords(householdVOS);
@@ -159,6 +149,10 @@
boolean flag = false;
household.setUpdateTime(new Date());
household.setUpdateUser(AuthUtil.getUserId());
+ if (!Strings.isBlank(household.getRoleName()) && household.getRoleName().equals("居民")){
+ // 待审核
+ household.setConfirmFlag(0);
+ }
if (null != household.getId()) {
// 更新
flag = updateById(household);
@@ -458,4 +452,29 @@
userHouseLabelService.remove(wrapper);
}
}
+
+ @Override
+ public List<HouseholdVO> getAllHouseHold(HouseholdVO household) {
+ return baseMapper.getAllHouseHold(household);
+ }
+
+ /**
+ * 住户列表查询
+ * @param household
+ * @return
+ */
+ @Override
+ public List<HouseholdVO> selectHouseholdList(HouseholdVO household) {
+ List<HouseholdVO> householdVOS = baseMapper.selectHouseholdList(household);
+ // 遍历
+ for (HouseholdVO householdVO : householdVOS) {
+ if (householdVO.getHouseholdLabelList().size()>0){
+ List<String> labelNameList = householdVO.getHouseholdLabelList().stream().map(householdLabelVO -> householdLabelVO.getLabelName())
+ .collect(Collectors.toList());
+ householdVO.setLabelName(String.join(",",labelNameList));
+ }
+ }
+ // 返回
+ return householdVOS;
+ }
}
--
Gitblit v1.9.3