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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

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

@@ -1,5 +1,12 @@
package com.panzhihua.service_community.service.impl;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;

import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -11,13 +18,8 @@
import com.panzhihua.service_community.dao.ComMngPopulationHouseUserDAO;
import com.panzhihua.service_community.model.dos.ComMngPopulationHouseUserDO;
import com.panzhihua.service_community.service.ComMngPopulationHouseUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import lombok.extern.slf4j.Slf4j;

/**
 * @auther lyq
@@ -26,11 +28,14 @@
 */
@Slf4j
@Service
public class ComMngPopulationHouseUserServiceImpl extends ServiceImpl<ComMngPopulationHouseUserDAO, ComMngPopulationHouseUserDO> implements ComMngPopulationHouseUserService {
public class ComMngPopulationHouseUserServiceImpl extends
    ServiceImpl<ComMngPopulationHouseUserDAO, ComMngPopulationHouseUserDO> implements ComMngPopulationHouseUserService {

    /**
     * 批量向房屋新增人员
     * @param housePopulationDTO    请求参数
     * 
     * @param housePopulationDTO
     *            请求参数
     * @return  添加结果
     */
    @Override
@@ -39,8 +44,8 @@
        List<ComMngPopulationHouseUserDO> populationHouseUserDOList = new ArrayList<>();
        if(!housePopulationDTO.getPopulationIds().isEmpty()){
            housePopulationDTO.getPopulationIds().forEach(housePopulationId -> {
                ComMngPopulationHouseUserDO populationHouseUserDO = this.baseMapper.selectOne(
                        new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
                ComMngPopulationHouseUserDO populationHouseUserDO =
                    this.baseMapper.selectOne(new QueryWrapper<ComMngPopulationHouseUserDO>().lambda()
                                .eq(ComMngPopulationHouseUserDO::getHouseId,housePopulationDTO.getHouseId())
                                .eq(ComMngPopulationHouseUserDO::getPopulId,housePopulationId));
                if(populationHouseUserDO == null){
@@ -70,7 +75,9 @@

    /**
     * 批量删除房屋内人员
     * @param housePopulationDTO    请求参数
     * 
     * @param housePopulationDTO
     *            请求参数
     * @return  删除结果
     */
    @Override
@@ -81,13 +88,15 @@
            return R.fail("未查询到居住用户数据");
        }
        if(housePopulationDTO.getType().equals(DelComMngHousePopulationDTO.type.hz)){
            if(houseUserDO.getRelationId() == null || !houseUserDO.getRelationId().equals(ComMngPopulationHouseUserDO.relationId.zizhu)){
            if (houseUserDO.getRelationId() == null
                || !houseUserDO.getRelationId().equals(ComMngPopulationHouseUserDO.relationId.zizhu)) {
                this.baseMapper.deleteById(housePopulationDTO.getHousePopulationId());
            }else{
                this.baseMapper.delBuildingHousePopulationRelation(housePopulationDTO.getHousePopulationId());
            }
        }else{
            if(houseUserDO.getRelation() == null || !houseUserDO.getRelation().equals(ComMngPopulationHouseUserDO.relation.hz)){
            if (houseUserDO.getRelation() == null
                || !houseUserDO.getRelation().equals(ComMngPopulationHouseUserDO.relation.hz)) {
                this.baseMapper.deleteById(housePopulationDTO.getHousePopulationId());
            }else{
                this.baseMapper.delBuildingHousePopulationRelationId(housePopulationDTO.getHousePopulationId());
@@ -98,7 +107,8 @@

    @Override
    public R getVillagePopulationHouseAdmin(PageComMngVillagePopulationHouseDTO villagePopulationDTO){
        return R.ok(this.baseMapper.getVillagePopulationHouseAdmin(new Page(villagePopulationDTO.getPageNum(),villagePopulationDTO.getPageSize()),villagePopulationDTO));
        return R.ok(this.baseMapper.getVillagePopulationHouseAdmin(
            new Page(villagePopulationDTO.getPageNum(), villagePopulationDTO.getPageSize()), villagePopulationDTO));
    }

}