Merge remote-tracking branch 'origin/master'

jiangping

2024-12-11 eb49564ab17c6695d8928d5a63a57c58b3cfd79c

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

@@ -74,11 +74,11 @@
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织类型不正确，请按要求填写~");
        }
        //查询名称不能重复
      /*  if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
        if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
                .eq(Company::getName,company.getName())
                .eq(Company::getIsdeleted,Constants.ZERO)) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织名称不能重复~");
        }*/
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(user ==null){
            user = company.getLoginUserInfo();
@@ -275,12 +275,12 @@
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织类型不正确，请按要求填写~");
        }
        //查询名称不能重复
 /*       if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
        if(companyMapper.selectCount(new QueryWrapper<Company>().lambda()
                .eq(Company::getName,company.getName())
                .ne(Company::getId,company.getId())
                .eq(Company::getIsdeleted,Constants.ZERO)) >0){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(), "对不起，组织名称不能重复~");
        }*/
        }
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(user == null){
            user = company.getLoginUserInfo();
@@ -355,8 +355,114 @@

    @Override
    public List<Company> findList(Company company) {
        QueryWrapper<Company> wrapper = new QueryWrapper<>(company);
        return companyMapper.selectList(wrapper);
        MPJLambdaWrapper<Company> queryWrapper = new MPJLambdaWrapper<>();
        if (company.getId() != null) {
            queryWrapper.eq(Company::getId, company.getId());
        }
        if (company.getCreator() != null) {
            queryWrapper.eq(Company::getCreator, company.getCreator());
        }
        if (company.getCreateDate() != null) {
            queryWrapper.ge(Company::getCreateDate, Utils.Date.getStart(company.getCreateDate()));
            queryWrapper.le(Company::getCreateDate, Utils.Date.getEnd(company.getCreateDate()));
        }
        if (company.getEditor() != null) {
            queryWrapper.eq(Company::getEditor, company.getEditor());
        }
        if (company.getEditDate() != null) {
            queryWrapper.ge(Company::getEditDate, Utils.Date.getStart(company.getEditDate()));
            queryWrapper.le(Company::getEditDate, Utils.Date.getEnd(company.getEditDate()));
        }
        if (company.getIsdeleted() != null) {
            queryWrapper.eq(Company::getIsdeleted, company.getIsdeleted());
        }
        if (company.getName() != null) {
            queryWrapper.like(Company::getName, company.getName());
        }
        if (company.getRemark() != null) {
            queryWrapper.eq(Company::getRemark, company.getRemark());
        }
        if (company.getStatus() != null) {
            queryWrapper.eq(Company::getStatus, company.getStatus());
        }
        if (company.getSortnum() != null) {
            queryWrapper.eq(Company::getSortnum, company.getSortnum());
        }
        if (company.getImgurl() != null) {
            queryWrapper.eq(Company::getImgurl, company.getImgurl());
        }
        if (company.getType() != null) {
            queryWrapper.eq(Company::getType, company.getType());
        }
        if (company.getCategoryId() != null) {
            queryWrapper.eq(Company::getCategoryId, company.getCategoryId());
        }
        if (company.getCode() != null) {
            queryWrapper.eq(Company::getCode, company.getCode());
        }
        if (company.getParentId() != null) {
            queryWrapper.eq(Company::getParentId, company.getParentId());
        }
        if (company.getLinkName() != null) {
            queryWrapper.eq(Company::getLinkName, company.getLinkName());
        }
        if (company.getLinkPhone() != null) {
            queryWrapper.eq(Company::getLinkPhone, company.getLinkPhone());
        }
        if (company.getHkId() != null) {
            queryWrapper.eq(Company::getHkId, company.getHkId());
        }
        if (company.getHkStatus() != null) {
            queryWrapper.eq(Company::getHkStatus, company.getHkStatus());
        }
        if (company.getHkDate() != null) {
            queryWrapper.ge(Company::getHkDate, Utils.Date.getStart(company.getHkDate()));
            queryWrapper.le(Company::getHkDate, Utils.Date.getEnd(company.getHkDate()));
        }
        if (company.getErpId() != null) {
            queryWrapper.eq(Company::getErpId, company.getErpId());
        }
        if (company.getErpDate() != null) {
            queryWrapper.ge(Company::getErpDate, Utils.Date.getStart(company.getErpDate()));
            queryWrapper.le(Company::getErpDate, Utils.Date.getEnd(company.getErpDate()));
        }
        if (company.getErpStatus() != null) {
            queryWrapper.eq(Company::getErpStatus, company.getErpStatus());
        }
        if (company.getDdId() != null) {
            queryWrapper.eq(Company::getDdId, company.getDdId());
        }
        if (company.getDdDate() != null) {
            queryWrapper.ge(Company::getDdDate, Utils.Date.getStart(company.getDdDate()));
            queryWrapper.le(Company::getDdDate, Utils.Date.getEnd(company.getDdDate()));
        }
        if (company.getDdStatus() != null) {
            queryWrapper.eq(Company::getDdStatus, company.getDdStatus());
        }
        if (company.getFsId() != null) {
            queryWrapper.eq(Company::getFsId, company.getFsId());
        }
        if (company.getFsStatus() != null) {
            queryWrapper.eq(Company::getFsStatus, company.getFsStatus());
        }
        if (company.getFsDate() != null) {
            queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(company.getFsDate()));
            queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(company.getFsDate()));
        }
        if (company.getQueryHiddenDanger() != null && Constants.equalsInteger(company.getQueryHiddenDanger(),Constants.ONE)) {
            queryWrapper.apply(" t.id in ( select hdp.COMPANY_ID from hidden_danger_param hdp where hdp.ISDELETED = 0 and hdp.STATUS = 0 and hdp.TYPE = 0  ) ");
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        queryWrapper.select(" t.* ")
                .select("(select count(m.id) from member m where m.COMPANY_ID=t.id and m.ISDELETED=0) as countNum") ;
        queryWrapper.select("t1.name",Company::getParentName);
        queryWrapper.select("t1.company_path",Company::getParentCompanyPath);
        queryWrapper.apply(" t.isdeleted = 0 ") ;
        queryWrapper.eq(Objects.nonNull(company.getStatus()),Company::getStatus,Constants.ZERO);
        queryWrapper.like(StringUtils.isNotBlank(company.getName()),Company::getName,company.getName());
        queryWrapper.like(StringUtils.isNotBlank(company.getParentName()),"c.name",company.getParentName());
        return companyMapper.selectList(queryWrapper);
    }

    @Override
@@ -575,7 +681,14 @@
        queryWrapper.leftJoin(Member.class,Member::getId,Company::getHeadId);
        queryWrapper.leftJoin(SystemUser.class,SystemUser::getId,Company::getEditor);
        queryWrapper.eq(Company::getIsdeleted,Constants.ZERO);
        queryWrapper.eq(type!=null,Company::getType,type);
        if(Objects.nonNull(type) && ( Constants.equalsInteger(type,Constants.ONE) || Constants.equalsInteger(type,Constants.ZERO))){
            queryWrapper.eq(type!=null,Company::getType,type);
        }else if(Objects.nonNull(type) &&  Constants.equalsInteger(type,Constants.TWO)){
            String companySpecialId = systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.SPECIAL_COMPANY_ID).getCode();
            if(StringUtils.isNotBlank(companySpecialId)){
                queryWrapper.apply(" (find_in_set('"+companySpecialId+"',REPLACE(t.company_path,'/',','))  or t.parent_id  is null  )  ");
            }
        }
        queryWrapper.orderByAsc(true,"t.sortnum");
        List<Company> companyList = companyJoinMapper.selectJoinList(Company.class,queryWrapper);
        //配置组员人员类型来源方式 0自建 1ERP