From 328d0a45a519bc4d0299d6d553042673d5098e21 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Wed, 27 Dec 2023 15:04:15 +0800
Subject: [PATCH] 楼盘表查询楼栋下户室（单个单元）修改
---
src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java | 58 ++++++++++++++++++++++++++++------------------------------
1 files changed, 28 insertions(+), 30 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 2b23e3f..135c9dc 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
@@ -18,29 +18,28 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.apache.logging.log4j.util.Strings;
import org.springblade.common.node.TreeStringNode;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.grid.service.IGridService;
-import org.springblade.modules.grid.vo.GridVO;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.excel.HouseHoldExcel;
import org.springblade.modules.house.mapper.HouseholdMapper;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdOtherVO;
import org.springblade.modules.house.vo.HouseholdVO;
-import org.springblade.modules.place.vo.PlaceVO;
+import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.DictBiz;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IDictBizService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import org.springframework.util.StopWatch;
import java.util.*;
@@ -62,18 +61,31 @@
@Autowired
private IUserService userService;
+ @Autowired
+ private IDeptService deptService;
+
@Override
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());
- }
- }
+ // 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);
}
@@ -164,25 +176,11 @@
* @param household
*/
public void updateUserInfo(HouseholdEntity household) {
- // 判断用户是否为业主，如果是业主，判断该房屋是否已有业主，如果有则提示已有业主，无法设置为业主，不是业主则不操作
+ // 判断用户是否为业主，如果是业主，则新增
if (null!=household.getRelationship() && household.getRelationship()==1){
// 如果为业主
- // 查询当前房屋是否已有业主
- QueryWrapper<HouseholdEntity> queryWrapper = new QueryWrapper<>();
- queryWrapper.eq("is_deleted",0)
- .eq("house_code",household.getHouseCode())
- .eq("relationship",1);
- List<HouseholdEntity> list = list(queryWrapper);
- if (list.size()==0){
- // 新增用户
- bindUserHandle(household);
- }else {
- HouseholdEntity householdEntity = list.get(0);
- if (null == householdEntity.getAssociatedUserId()){
- // 新增用户
- bindUserHandle(household);
- }
- }
+ // 新增用户
+ bindUserHandle(household);
}
}
@@ -265,8 +263,8 @@
* @return
*/
@Override
- public Integer statistics(Long userId) {
- return baseMapper.statistics(userId);
+ public Integer statistics(Long userId,String neiCode) {
+ return baseMapper.statistics(userId,neiCode);
}
/**
--
Gitblit v1.9.3