git ch

k94314517

2025-07-01 520433f6d88c1f4c1a2d31ca950f2309da2d4a9a

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

@@ -701,9 +701,14 @@
            //本月新增投保企业
            insuranceApplyDataVO.setMonthAddInsuranceCompanyNum(Objects.nonNull(monthAddInsuranceCompanyNum)?monthAddInsuranceCompanyNum:Constants.ZERO);
            //直保保单数量
            insuranceApplyDataVO.setZbInsuranceNum(insuranceApplyList.stream().filter(i -> Constants.equalsInteger(i.getSolutionType(), Constants.ZERO)).collect(Collectors.toList()).size());
            insuranceApplyDataVO.setZbInsuranceNum(insuranceApplyList.stream().filter(i -> Constants.equalsInteger(i.getSolutionType(), Constants.ZERO)
                            &&(Constants.equalsInteger(i.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                    || Constants.equalsInteger(i.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey())))
                    .collect(Collectors.toList()).size());
            //委托保保单数量
            insuranceApplyDataVO.setWtbInsuranceNum(insuranceApplyList.stream().filter(i -> Constants.equalsInteger(i.getSolutionType(), Constants.ONE)).collect(Collectors.toList()).size());
            insuranceApplyDataVO.setWtbInsuranceNum(insuranceApplyList.stream().filter(i -> Constants.equalsInteger(i.getSolutionType(), Constants.ONE)
                    &&(Constants.equalsInteger(i.getStatus(), Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
                    || Constants.equalsInteger(i.getStatus(), Constants.InsuranceApplyStatus.WTB_DONE.getKey()))).collect(Collectors.toList()).size());
        }

            //合计总费用
@@ -993,13 +998,18 @@
        DataListVO dataListVOA = new DataListVO();
        dataListVOA.setDataFirst("不在保");
        dataListVOA.setDataSecond(
                applyDetailJoinMapper.selectJoinCount( new MPJLambdaWrapper<ApplyDetail>()
                applyDetailJoinMapper.selectJoinList(ApplyDetail.class, new MPJLambdaWrapper<ApplyDetail>()
                        .select(ApplyDetail::getMemberId)
                                .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyDetail::getApplyId)
                                .eq(ApplyDetail::getIsdeleted, Constants.ZERO)
                                .eq(InsuranceApply::getIsdeleted, Constants.ZERO)
                                .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                                .eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
                                .apply("  t.END_TIME < now() ")).toString()

                                .apply("  t.END_TIME < now() ")
                        .groupBy(ApplyDetail::getMemberId)

                ).size()+""

        );
        dataListVOList.add(dataListVOA);
@@ -1008,13 +1018,14 @@
        DataListVO dataListVOB = new DataListVO();
        dataListVOB.setDataFirst("保障中");
        dataListVOB.setDataSecond(
                applyDetailJoinMapper.selectJoinCount( new MPJLambdaWrapper<ApplyDetail>()
                applyDetailJoinMapper.selectJoinList(ApplyDetail.class, new MPJLambdaWrapper<ApplyDetail>()
                .select(ApplyDetail::getMemberId)
                        .leftJoin(InsuranceApply.class, InsuranceApply::getId, ApplyDetail::getApplyId)
                        .eq(ApplyDetail::getIsdeleted, Constants.ZERO)
                        .eq(InsuranceApply::getIsdeleted, Constants.ZERO)
                        .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())
                        .eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId())
                        .apply("  t.END_TIME >= now() ")).toString()
                        .apply("  t.END_TIME >= now() ").groupBy(ApplyDetail::getMemberId)).size()+""
        );

        dataListVOList.add(dataListVOB);