最新版本541200007

jiangping

2025-03-07 a0285d19d00697757f99fc75a4e45778854f5af9

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

@@ -17,14 +17,14 @@
import com.doumee.core.haikang.model.param.respose.OrgOrUserAddResponse;
import com.doumee.core.haikang.model.param.respose.OrgUpdateFailureResponse;
import com.doumee.core.haikang.service.HKService;
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.LoginUserInfo;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.admin.request.UpdateCompanySortDTO;
import com.doumee.dao.admin.response.CompanyDTO;
import com.doumee.dao.business.MemberMapper;
import com.doumee.dao.business.dao.MemberMapper;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.dao.join.CompanyJoinMapper;
import com.doumee.dao.business.model.Company;
@@ -36,7 +36,6 @@
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
import org.checkerframework.checker.units.qual.C;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -118,6 +117,7 @@
        company.setHkDate(company.getCreateDate());
        company.setEditDate(company.getCreateDate());
        company.setEditor(company.getCreator());
        company.setPinyin(Constants.getChinesePingyin(company.getName()));
        company.setHkId(UUID.randomUUID().toString().replace("-",""));
        companyMapper.insert(company);
        //下发海康安防平台
@@ -135,7 +135,7 @@
        List<OrgAddRequest> addList = new ArrayList<>();
        addList.add(getOrgAddModel(company));
        BaseResponse<OrgOrUserAddResponse> result =  HKService.addBatchOrg(addList);
        if(result !=null && StringUtils.equals(result.getCode(),HKConstants.RESPONSE_SUCCEE)){
        if(result !=null && StringUtils.equals(result.getCode(), HKConstants.RESPONSE_SUCCEE)){
            OrgOrUserAddResponse data = result.getData();
            if(data.getSuccesses()!=null && data.getSuccesses().size()>0){
                //处理新增成功的数据，修改海康同步状态
@@ -209,6 +209,7 @@
        insert.setCode(company.getCode());
        insert.setParentId(company.getParentId());
        insert.setLinkName(company.getLinkName());
        company.setPinyin(Constants.getChinesePingyin(company.getName()));
        insert.setLinkPhone(company.getLinkPhone());
        companyMapper.insert(insert);
        return insert.getId();
@@ -306,6 +307,7 @@
        company.setHkDate(company.getHkDate());
        company.setHkId(StringUtils.defaultString(model.getHkId(),UUID.randomUUID().toString().replace("-","")));
        company.setParentId(null);//不支持修改父级
        company.setPinyin(Constants.getChinesePingyin(company.getName()));
        companyMapper.updateById(company);
        //更新的companyPath
        String newName = model.getCompanyNamePath().replace(model.getName(),company.getName());
@@ -356,8 +358,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.orderByAsc(Company::getPinyin);
        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
@@ -459,10 +567,9 @@
            queryWrapper.ge(Company::getFsDate, Utils.Date.getStart(pageWrap.getModel().getFsDate()));
            queryWrapper.le(Company::getFsDate, Utils.Date.getEnd(pageWrap.getModel().getFsDate()));
        }
        queryWrapper.orderByDesc(Company::getCreateDate);
        queryWrapper.leftJoin(Company.class,Company::getId,Company::getParentId);
        /*        .leftJoin(Member.class, Member::getId,Company::getHeadId)*/
      /*  queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
        /*  queryWrapper.leftJoin(" company c on c.id=t.parent_id");*/
        queryWrapper.selectAll(Company.class)
                .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);
@@ -470,6 +577,7 @@
        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());
        queryWrapper.orderByAsc(Company::getPinyin);
        IPage<Company> companyIPage = companyJoinMapper.selectJoinPage(page, Company.class, queryWrapper);
        return PageData.from(companyIPage);
    }
@@ -498,7 +606,8 @@
        LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();

        wrapper.eq(Company::getIsdeleted,Constants.ZERO)
                .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type);
                .eq(Constants.equalsInteger(type,Constants.ONE),Company::getType,type)
                .orderByAsc(Company::getPinyin);
        List<Company> companies = companyMapper.selectList(wrapper);
        return getCompanyTree( companies, null);
    }
@@ -550,6 +659,7 @@
        if (CollectionUtils.isEmpty(companies)){
            return;
        }
        company.setPinyin(Constants.getChinesePingyin(company.getName()));
        //新增的情况存在记录
        if (Objects.isNull(company.getId())){
            throw new BusinessException(ResponseStatus.DATA_EXISTS.getCode(),"公司名称已存在");
@@ -576,7 +686,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