Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

 server/dmvisit_service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java

@@ -1,5 +1,7 @@
package com.doumee.service.business.impl;

import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.doumee.core.annotation.excel.ExcelColumn;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.model.LoginUserInfo;
@@ -7,10 +9,12 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.CompanyMapper;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Category;
import com.doumee.dao.business.model.Company;
import com.doumee.dao.business.model.Member;
import com.doumee.dao.system.model.SystemUser;
import com.doumee.service.business.CompanyService;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -18,12 +22,19 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.github.yulichang.wrapper.MPJLambdaWrapper;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Objects;
import java.util.stream.Collectors;

/**
 * 企业信息表Service实现
@@ -73,7 +84,14 @@

    @Override
    public void deleteById(Integer id) {
        companyMapper.deleteById(id);
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        Company company=new Company();
        company.setId(id);
        company.setIsdeleted(Constants.ZERO);
        company.setEditDate(new Date());
        company.setEditor(loginUserInfo.getId());
        companyMapper.updateById(company);
    }

    @Override
@@ -87,7 +105,17 @@
        if (CollectionUtils.isEmpty(ids)) {
            return;
        }
        companyMapper.deleteBatchIds(ids);
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        Company company=new Company();

      //  companyMapper.deleteBatchIds(ids);
        ids.stream().forEach(s->{
            company.setId(s);
            company.setIsdeleted(Constants.ZERO);
            company.setEditDate(new Date());
            company.setEditor(loginUserInfo.getId());
            companyMapper.updateById(company);
        });
    }

    @Override
@@ -134,6 +162,7 @@
        IPage<Company> page = new Page<>(pageWrap.getPage(), pageWrap.getCapacity());
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        Utils.MP.blankToNull(pageWrap.getModel());
        pageWrap.getModel().setIsdeleted(Constants.ZERO);
        if (pageWrap.getModel().getId() != null) {
            queryWrapper.eq(Company::getId, pageWrap.getModel().getId());
        }
@@ -155,7 +184,7 @@
            queryWrapper.eq(Company::getIsdeleted, pageWrap.getModel().getIsdeleted());
        }
        if (pageWrap.getModel().getName() != null) {
            queryWrapper.eq(Company::getName, pageWrap.getModel().getName());
            queryWrapper.like(Company::getName, pageWrap.getModel().getName());
        }
        if (pageWrap.getModel().getRemark() != null) {
            queryWrapper.eq(Company::getRemark, pageWrap.getModel().getRemark());
@@ -228,21 +257,75 @@
            queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId)
                    .leftJoin(SystemUser.class,SystemUser::getId,Company::getCreator);
        queryWrapper.leftJoin(Category.class,Category::getId,Company::getCategoryId);
        /*        .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
      /*  queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
        queryWrapper.selectAll(Company.class)
                    .selectAs(Category::getName,Company::getCategoryName)
                    .select("count(t1.id) as countNum")
                    .selectAs(SystemUser::getRealname,Company::getCreatorName);
                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum")
                /*.select("c.name as parentName");*/
                  .selectAs(Category::getName,Company::getCategoryName);
                   /*   .selectAs(Member::getName,Company::getHeadName)
                    .selectAs(Member::getPhone,Company::getHeadPhone)
                    .select("count(t1.id) as countNum");*/
//        queryWrapper.eq(Company::getType,Constants.ZERO);
        queryWrapper.eq(Objects.nonNull(pageWrap.getModel().getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getName()),Company::getName,pageWrap.getModel().getName());
        queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getParentName()),"c.name",pageWrap.getModel().getParentName());
        IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
        return PageData.from(companyIPage);
    }

    @Override
    public void updateStatusById(Company company) {
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();

        company.setEditDate(new Date());
        company.setEditor(loginUserInfo.getId());
        company.setStatus(company.getStatus());
        companyMapper.updateById(company);
    }


    @Override
    public long count(Company company) {
        QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
        return companyMapper.selectCount(wrapper);
    }


    @Override
    public List<CompanyDTO> findCompanyTreePage(Integer type) {

        LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();

        wrapper.eq(Company::getIsdeleted,Constants.ZERO)
                .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type);
        List<Company> companies = companyMapper.selectList(wrapper);
        return getCompanyTree( companies, null);
    }


    private List<CompanyDTO> getCompanyTree(List<Company> companies, Integer parentId){
        if (CollectionUtils.isEmpty(companies)){
            return null;
        }
        List<Company> collect = companies.stream()
                                        .filter(s -> Constants.equalsInteger(s.getParentId(), parentId))
                                        .collect(Collectors.toList());
        if (CollectionUtils.isEmpty(companies)){
            return null;
        }
        List<CompanyDTO> companyDTOList = new ArrayList<>();
        for (int i = 0; i < collect.size(); i++) {
            Company company = collect.get(i);
            CompanyDTO companyDTO = new CompanyDTO();
            BeanUtils.copyProperties(company,companyDTO);
            companyDTO.setCompanyDTOList(getCompanyTree(companies, company.getId()));
            companyDTOList.add(companyDTO);
        }
        return companyDTOList;
    }


    /**
     * 劳务公司唯一性校验
@@ -255,9 +338,16 @@
                .eq(Company::getType,Constants.ZERO)
                .eq(Company::getName,company.getName());
        List<Company> companies = companyMapper.selectList(wrapper);

        if (CollectionUtils.isNotEmpty(companies)){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"企业信息已存在");
        if (CollectionUtils.isEmpty(companies)){
            return;
        }
        //新增的情况存在记录
        if (Objects.isNull(company.getId())){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"公司名称已存在");
        }
        //修改的情况存在记录 匹配不到 own
        if (!companies.stream().map(s -> s.getId()).anyMatch(s -> s.equals(company.getId()))){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"公司名称已存在");
        }
    }
}