Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComMngStructHouseServiceImpl.java

@@ -3,11 +3,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.panzhihua.common.model.dtos.community.ExcelHouseDTO;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
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.ComMngStructAreaDAO;
import com.panzhihua.service_community.dao.ComMngStructHouseDAO;
import com.panzhihua.service_community.dao.ComMngStructHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngStructAreaDO;
@@ -23,6 +26,7 @@
import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;

/**
@@ -38,7 +42,8 @@
    private ComMngStructHouseDAO comMngStructHouseDAO;
    @Resource
    private ComMngStructHouseUserDAO comMngStructHouseUserDAO;

    @Resource
    private ComMngStructAreaDAO comMngStructAreaDAO;
    /**
     * 房屋信息
     *
@@ -48,16 +53,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);
    }
@@ -484,5 +509,15 @@
        throw new RuntimeException("绑定房屋和人员关系失败");
    }

    @Override
    public R houseExport(Long areaId) {
        ComMngStructAreaDO comMngStructAreaDO = comMngStructAreaDAO.selectById(areaId);
        if (ObjectUtils.isEmpty(comMngStructAreaDO)) {
            return R.fail("小区不存在");
        }
        List<ExcelHouseDTO>  houseDTOS = comMngStructHouseDAO.houseExport(comMngStructAreaDO.getAreaCode());
        return R.ok(houseDTOS);
    }


}