From 68f64a1e69e852654f097e84d15843f37bdf34b7 Mon Sep 17 00:00:00 2001
From: findyguo <12205921@qq.com>
Date: 星期五, 05 三月 2021 10:29:25 +0800
Subject: [PATCH] 留言查询
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java | 56 ++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 42 insertions(+), 14 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java
index 7f10b75..ca18247 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java
@@ -8,6 +8,7 @@
import com.panzhihua.common.model.vos.community.BatchhouseVO;
import com.panzhihua.common.model.vos.community.ComMngStructAreaVO;
import com.panzhihua.common.model.vos.community.ComMngStructHouseVO;
+import com.panzhihua.common.model.vos.user.CommunityUserInfoVO;
import com.panzhihua.service_community.dao.ComMngStructHouseDAO;
import com.panzhihua.service_community.dao.ComMngStructHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
@@ -23,6 +24,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
/**
@@ -48,16 +50,36 @@
@Override
public R detailHouse(Long userId) {
List<ComMngStructHouseVO> comMngStructHouseVOS = new ArrayList<>();
- List<ComMngStructHouseUserDO> comMngStructHouseUserDOS = comMngStructHouseUserDAO.selectList(new QueryWrapper<ComMngStructHouseUserDO>().lambda().eq(ComMngStructHouseUserDO::getUserId, userId));
- if (!ObjectUtils.isEmpty(comMngStructHouseUserDOS)) {
- comMngStructHouseUserDOS.forEach(comMngStructHouseUserDO -> {
- ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, comMngStructHouseUserDO.getHouseCode()));
- ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO();
- BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO);
- comMngStructHouseVO.setIdentity(comMngStructHouseUserDO.getIdentity());
- comMngStructHouseVOS.add(comMngStructHouseVO);
- });
- return R.ok(comMngStructHouseVOS);
+ if ( userId< 100000000l) {
+ List<ComMngStructHouseUserDO> comMngStructHouseUserDOS = comMngStructHouseUserDAO.selectList(new QueryWrapper<ComMngStructHouseUserDO>().lambda().eq(ComMngStructHouseUserDO::getUserId, userId));
+ if (!ObjectUtils.isEmpty(comMngStructHouseUserDOS)) {
+ String areaCode = comMngStructHouseUserDOS.get(0).getAreaCode();
+ ComMngStructHouseDO comMngStructHouseDO1 = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, areaCode));
+ String houseName = comMngStructHouseDO1.getHouseName();
+ comMngStructHouseUserDOS.forEach(comMngStructHouseUserDO -> {
+ ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, comMngStructHouseUserDO.getHouseCode()));
+ ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO();
+ BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO);
+ comMngStructHouseVO.setIdentity(comMngStructHouseUserDO.getIdentity());
+ comMngStructHouseVOS.add(comMngStructHouseVO);
+ });
+ return R.ok(comMngStructHouseVOS);
+ }
+ }else{
+ userId=userId-100000000l;
+// 查导入人员的房屋
+ Map<String,Object> map=comMngStructHouseUserDAO.selectHouseCode(userId);
+ String houseCode = map.get("house_code").toString();
+ String isRent = map.get("is_rent").toString();
+ ComMngStructHouseDO comMngStructHouseDO = comMngStructHouseDAO.selectOne(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getHouseCode, houseCode));
+ ComMngStructHouseVO comMngStructHouseVO = new ComMngStructHouseVO();
+ BeanUtils.copyProperties(comMngStructHouseDO, comMngStructHouseVO);
+ if (isRent.equals("1")) {
+ comMngStructHouseVO.setIdentity(1);
+ }else{
+ comMngStructHouseVO.setIdentity(2);
+ }
+ comMngStructHouseVOS.add(comMngStructHouseVO);
}
return R.ok(comMngStructHouseVOS);
}
@@ -182,11 +204,11 @@
if (isAccumulation == 1) {//累加
doorName = "0" + num;
} else {
- doorName = "" + h;
+ doorName = "0" + h;
}
} else {
if (isAccumulation == 1) {//累加
- doorName = "0" + num;
+ doorName = "" + num;
} else {
doorName = "" + h;
}
@@ -298,8 +320,8 @@
if (type == 5) {
List<LoginUserInfoVO> loginUserInfoVOS = comMngStructHouseUserDAO.selectListHouseUser(houseCode1);
if (!ObjectUtils.isEmpty(loginUserInfoVOS)) {
- String names = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getName()).collect(Collectors.joining());
- String phones = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getPhone()).collect(Collectors.joining());
+ String names = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getName()).collect(Collectors.joining(","));
+ String phones = loginUserInfoVOS.stream().map(loginUserInfoVO -> loginUserInfoVO.getPhone()).collect(Collectors.joining(","));
comMngStructHouseVO.setNames(names);
comMngStructHouseVO.setPhones(phones);
}
@@ -320,6 +342,9 @@
*/
@Override
public R addHouse(BatchhouseVO batchhouseVO, ComMngStructAreaDO comMngStructAreaDO) {
+ String roleConnector = comMngStructAreaDO.getRoleConnector();
+ String roleDoor = comMngStructAreaDO.getRoleDoor();
+ String roleFloor = comMngStructAreaDO.getRoleFloor();
int type = batchhouseVO.getType().intValue();
String parentCode1 = batchhouseVO.getParentCode();
List<ComMngStructHouseDO> comMngStructHouseDOList = comMngStructHouseDAO.selectList(new QueryWrapper<ComMngStructHouseDO>().lambda().eq(ComMngStructHouseDO::getType, type).eq(ComMngStructHouseDO::getParentCode, parentCode1));
@@ -373,6 +398,9 @@
}
}
}
+ batchhouseVO.setRuleConnector(roleConnector);
+ batchhouseVO.setRuleDoor(roleDoor);
+ batchhouseVO.setRuleFloor(roleFloor);
this.batchSaveHouse(batchhouseVO);
return R.ok();
}
--
Gitblit v1.7.1