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

jiangping

2024-12-27 5506edbe54883b31db3cc8e4a1d9d0795a18a3c9

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

@@ -10,6 +10,7 @@
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.business.*;
import com.doumee.dao.business.join.CompanyJoinMapper;
import com.doumee.dao.business.join.CompanySolutionJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.system.SystemUserMapper;
@@ -41,6 +42,7 @@
import java.net.URLEncoder;
import java.nio.charset.Charset;
import java.util.*;
import java.util.stream.Collectors;

/**
 * 企业信息表Service实现
@@ -54,6 +56,8 @@
    private boolean debugModel;
    @Autowired
    private CompanyMapper companyMapper;
    @Autowired
    private CompanyJoinMapper companyJoinMapper;
    @Autowired
    private CompanyDepartmentMapper companyDepartmentMapper;
    @Autowired
@@ -72,6 +76,8 @@
    private SmsEmailMapper smsEmailMapper;
    @Autowired
    private SystemDictDataBiz systemDictDataBiz;
    @Autowired
    private NoticesMapper noticesMapper;

    @Override
    @Transactional
@@ -160,7 +166,7 @@


    @Override
    @Transactional
    @Transactional(rollbackFor = {Exception.class,BusinessException.class})
    public void  updateSolutions(Company company) {
        if(company.getId()==null
                ||company.getSolutionList() == null
@@ -171,7 +177,6 @@
        if(model == null  || !Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO) ){
            throw  new BusinessException(ResponseStatus.DATA_EMPTY );
        }
        companySolutionJoinMapper.delete(new UpdateWrapper<CompanySolution>().lambda().eq(CompanySolution::getCompanyId,company.getId()));
        //处理关联方案
        dealSolutionsData(company);
    }
@@ -304,6 +309,104 @@
        List<CompanySolution> list = new ArrayList<>();
        int num =0;
        Date date = new Date();
        List<CompanySolution> addList = new ArrayList<>();
        List<CompanySolution> delList = new ArrayList<>();
        List<CompanySolution> updList = new ArrayList<>();
        List<CompanySolution> companySolutionList = companySolutionJoinMapper.selectList(new QueryWrapper<CompanySolution>().lambda().eq(CompanySolution::getCompanyId,company.getId()));
        for(CompanySolution s :company.getSolutionList()){
            if(companySolutionList.stream().filter(i->Constants.equalsInteger(i.getSolutionBaseId(),s.getSolution().getBaseId())).collect(Collectors.toList()).size()>Constants.ZERO){
                updList.add(s);
            }else{
                addList.add(s);
            }
        }
        for (CompanySolution s:companySolutionList) {
            if( addList.stream().filter(i->Constants.equalsInteger(i.getSolution().getBaseId(),s.getSolutionBaseId())).collect(Collectors.toList()).size()>Constants.ZERO
            || updList.stream().filter(i->Constants.equalsInteger(i.getSolution().getBaseId(),s.getSolutionBaseId())).collect(Collectors.toList()).size()>Constants.ZERO
            ){
                continue;
            }
            delList.add(s);
        }
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(delList)){
            companySolutionJoinMapper.delete(new UpdateWrapper<CompanySolution>().lambda().in(CompanySolution::getId,delList.stream().map(i->i.getId()).collect(Collectors.toList())));
        }
        if(com.github.xiaoymin.knife4j.core.util.CollectionUtils.isNotEmpty(addList)){
            for(CompanySolution s :addList){
                if(Objects.isNull(s.getSolution())){
                    continue;
                }
                if(s.getSolution().getBaseId() == null){
                    continue;
                }
                Solutions newVersion = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,s.getSolution().getBaseId())
                        .eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
                if(Objects.isNull(newVersion)){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请添加有效的保险方案信息！");
                }
                //查询方案的方案确认书
                Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
                        .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
                        .eq(Multifile::getIsdeleted,Constants.ZERO)
                        .eq(Multifile::getObjId,newVersion.getId())
                );
                if(Objects.isNull(multifile) ||  StringUtils.isBlank(multifile.getFileurl())){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到方案确认书！");
                }
                sIds.add(s.getSolution().getBaseId());
                s.setCompanyId(company.getId());
                s.setIsdeleted(Constants.ZERO);
                s.setCanAdd(Constants.formatIntegerNum(s.getCanAdd()));
                s.setCanReduce(Constants.formatIntegerNum(s.getCanReduce()));
                s.setCreateDate(date);
                s.setCreator(company.getCreator());
                s.setSortnum(num++);
                s.setSolutionBaseId( s.getSolution().getBaseId() );
                s.setSolutionId( newVersion.getId() );
                s.setStatus(Constants.ZERO);
                s.setFileUrl(multifile.getFileurl());
                s.setSignStatus(Constants.ZERO);
                s.setSolutionName(newVersion.getName());
                list.add(s);
            }
            if(list.size() ==0){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请添加有效的保险方案信息！");
            }
            List<Solutions> solutionsList = solutionsMapper.selectList(new QueryWrapper<Solutions>().lambda()
                    .in(Solutions::getId,sIds)
                    .eq(Solutions::getIsdeleted,Constants.ZERO));
            if(solutionsList.size()!= list.size()){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请添加有效的保险方案信息哦");
            }
            for(Solutions s:solutionsList){
                if(Constants.equalsInteger(s.getStatus(),Constants.ONE)){
                    throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"保险方案【"+s.getName()+"】已被禁用，不能进行该操作");
                }
            }
            companySolutionJoinMapper.insertBatchSomeColumn(list);
            //存储待办信息
            Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.SOLUTIONS;
            for (CompanySolution s:list) {
                Solutions newVersion = solutionsMapper.selectById(s.getSolutionId());
                //平台待办
                Notices notices = new Notices(noticeObjectType,
                        Constants.ONE
                        ,s.getId(),
                        newVersion.getName() ,
                        company.getId()
                        ,Constants.NoticeType.ZERO);
                noticesMapper.insert(notices);

            }

        }
    }

    /*private void dealSolutionsData(Company company) {
        List<Integer> sIds = new ArrayList<>();
        List<CompanySolution> list = new ArrayList<>();
        int num =0;
        Date date = new Date();
        for(CompanySolution s :company.getSolutionList()){
            if(Objects.isNull(s.getSolution())){
                continue;
@@ -316,6 +419,15 @@
            if(Objects.isNull(newVersion)){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"请添加有效的保险方案信息！");
            }
            //查询方案的方案确认书
            Multifile multifile = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
                    .eq(Multifile::getObjType,Constants.MultiFile.SOLUTIONS_CONFIRMATION_LATTER.getKey())
                    .eq(Multifile::getIsdeleted,Constants.ZERO)
                    .eq(Multifile::getObjId,newVersion.getId())
            );
            if(Objects.isNull(multifile) ||  StringUtils.isBlank(multifile.getFileurl())){
                throw  new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"未查询到方案确认书！");
            }
            sIds.add(s.getSolution().getBaseId());
            s.setCompanyId(company.getId());
            s.setIsdeleted(Constants.ZERO);
@@ -327,6 +439,8 @@
            s.setSolutionBaseId( s.getSolution().getBaseId() );
            s.setSolutionId( newVersion.getId() );
            s.setStatus(Constants.ZERO);
            s.setFileUrl(multifile.getFileurl());
            s.setSignStatus(Constants.ZERO);
            list.add(s);
        }
        if(list.size() ==0){
@@ -344,7 +458,12 @@
            }
        }
        companySolutionJoinMapper.insertBatchSomeColumn(list);
    }
    }*/








@@ -833,7 +952,7 @@
        company.setIsdeleted(Constants.ZERO);
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(Constants.equalsInteger(company.getType(),Constants.ONE)){
//                return new ArrayList<>();

        }else  {
            company.setType(Constants.ZERO);
            if(Constants.equalsInteger(user.getType(),Constants.TWO)){
@@ -856,6 +975,19 @@
        }
        return companyMapper.selectList(wrapper);
    }

    @Override
    public List<Company> findAllCompanyList() {
        LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        List<Company> companyList = companyMapper.selectList(
               new QueryWrapper<Company>().lambda()
                       .eq(Company::getIsdeleted,Constants.ZERO)
                       .eq(Company::getType,Constants.ZERO)
                       .ne(Constants.equalsInteger(user.getType(),Constants.ONE),Company::getId,user.getCompanyId())
        );
        return companyList;
    }


    @Override
    public PageData<Company> findPage(PageWrap<Company> pageWrap) {
@@ -885,7 +1017,6 @@
                    queryWrapper.select("*,(select count(1) from company_permission b where b.user_id="+user.getId()+" and b.isdeleted=0 and b.company_id=company.id) as hasPerimission");
                }
            }

        }

        if (pageWrap.getModel().getId() != null) {
@@ -927,7 +1058,7 @@
            queryWrapper.lambda().eq(Company::getCode, pageWrap.getModel().getCode());
        }
        if (pageWrap.getModel().getUsername() != null) {
            queryWrapper.lambda().eq(Company::getUsername, pageWrap.getModel().getUsername());
            queryWrapper.lambda().like(Company::getUsername, pageWrap.getModel().getUsername());
        }
        if (pageWrap.getModel().getTaxCode() != null) {
            queryWrapper.lambda().eq(Company::getTaxCode, pageWrap.getModel().getTaxCode());
@@ -948,7 +1079,7 @@
            queryWrapper.lambda().eq(Company::getInvoiceAddr, pageWrap.getModel().getInvoiceAddr());
        }
        if (pageWrap.getModel().getPhone() != null) {
            queryWrapper.lambda().eq(Company::getPhone, pageWrap.getModel().getPhone());
            queryWrapper.lambda().like(Company::getPhone, pageWrap.getModel().getPhone());
        }
        if (pageWrap.getModel().getEmail() != null) {
            queryWrapper.lambda().eq(Company::getEmail, pageWrap.getModel().getEmail());