git ch

k94314517

2025-07-04 50fb58286ed3b718c39a97e0987ee7561a295651

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

@@ -229,27 +229,27 @@
        LoginUserInfo loginUserInfo =(LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        //企业人员查看本企业数据
        if(loginUserInfo.getType().equals(Constants.ONE)){
            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId())
                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+"  and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and  a.end_time >= now() ) ", Member::getValidNum )

                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+"  and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and a.end_time < now() ) ", Member::getInvalidNum );
            queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
//                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+"  and b.status in (" +
//                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
//                            " and  a.end_time >= now() ) ", Member::getValidNum )
//
//                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.company_id = "+loginUserInfo.getCompanyId()+"  and b.status in (" +
//                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
//                            " and a.end_time < now() ) ", Member::getInvalidNum );
        }else{
            if(loginUserInfo.getCompanyIdList()!=null && loginUserInfo.getCompanyIdList().size()>0){
                queryWrapper.in(InsuranceApply::getCompanyId, loginUserInfo.getCompanyIdList());
            }else{
                queryWrapper.eq(InsuranceApply::getCompanyId, -1);
            }
            queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId())
                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and  a.end_time >= now() ) ", Member::getValidNum )
                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.status in (" +
                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
                            " and a.end_time < now() ) ", Member::getInvalidNum );
            queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
//                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.status in (" +
//                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
//                            " and  a.end_time >= now() ) ", Member::getValidNum )
//                    .select( " ( select count(1) from apply_detail a inner join insurance_apply b on a.APPLY_ID = b.id  where a.member_id = t.id and b.status in (" +
//                            " "+Constants.InsuranceApplyStatus.WTB_DONE.getKey()+","+Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey()+" ) " +
//                            " and a.end_time < now() ) ", Member::getInvalidNum );
        }
        queryWrapper.selectAll(Member.class)
                .and(StringUtils.isNotBlank(memberQueryDTO.getKeywords()),
@@ -268,6 +268,7 @@
         queryWrapper.orderByAsc(Member::getName);
        PageData<Member> pageData = PageData.from(memberJoinMapper.selectJoinPage(page,Member.class, queryWrapper));

        this.getValidNum(pageData,loginUserInfo);
        Integer sn = 0;
        for (Member member:pageData.getRecords()) {
            sn = sn + 1;
@@ -279,6 +280,36 @@
        }
        return pageData;
    }

    public void getValidNum(PageData<Member> pageData,LoginUserInfo loginUserInfo){
        List<Integer> listId = pageData.getRecords().stream().map(i->i.getId()).collect(Collectors.toList());
        if(CollectionUtils.isNotEmpty(listId)){
            Integer companyId = null;
            if(Objects.nonNull(loginUserInfo.getType())&&Constants.equalsInteger(loginUserInfo.getType(),Constants.ONE)){
                companyId = loginUserInfo.getShowCompany().getId();
            }
            List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectJoinList(ApplyDetail.class,
                    new MPJLambdaWrapper<ApplyDetail>()
                            .select(ApplyDetail::getMemberId,ApplyDetail::getStartTime,ApplyDetail::getEndTime,ApplyDetail::getId)
                            .leftJoin(InsuranceApply.class,InsuranceApply::getId,ApplyDetail::getApplyId)
                            .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                            .in(ApplyDetail::getMemberId,listId)
                            .eq(Objects.nonNull(companyId)
                                    ,InsuranceApply::getCompanyId,companyId)
            );

            if(CollectionUtils.isNotEmpty(applyDetailList)){
                for (Member member:pageData.getRecords()) {
                    member.setInvalidNum(applyDetailList.stream().filter(i->Constants.equalsInteger(i.getMemberId(),member.getId())&&i.getEndTime().getTime()<System.currentTimeMillis()).collect(Collectors.toList()).size());
                    member.setValidNum(
                            applyDetailList.stream().filter(i->Constants.equalsInteger(i.getMemberId(),member.getId())&&i.getEndTime().getTime()>=System.currentTimeMillis()).collect(Collectors.toList()).size()
                    );
                }
            }
        }
    }



    @Override
    public long count(Member member) {
@@ -383,9 +414,9 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择有效的方案再进行操作！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
        }
//        if(!loginUserInfo.getType().equals(Constants.ONE)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
//        }
        ExcelImporter ie = null;
        List<MemberReduceImport> dataList =null;
        try {
@@ -399,9 +430,9 @@
        }

        InsuranceApply insuranceApply = insuranceApplyMapper.selectById(applyId);
        if (Objects.isNull(insuranceApply) || !Constants.equalsInteger(insuranceApply.getCompanyId(),loginUserInfo.getCompanyId())) {
            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，保单信息不存在，请刷新页面重试！");
        }
//        if (Objects.isNull(insuranceApply) || !Constants.equalsInteger(insuranceApply.getCompanyId(),loginUserInfo.getCompanyId())) {
//            throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"对不起，保单信息不存在，请刷新页面重试！");
//        }
        if (!(Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                ||Constants.equalsInteger(insuranceApply.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey())
        )) {
@@ -502,9 +533,9 @@
            throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"对不起，请选择有效的方案再进行操作！");
        }
        LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
        if(!loginUserInfo.getType().equals(Constants.ONE)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
        }
//        if(!loginUserInfo.getType().equals(Constants.ONE)){
//            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"非企业人员无法进行该操作");
//        }
        if(Objects.isNull(solutionId)){
            throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"参数错误 - 方案信息");
        }