From 50fb58286ed3b718c39a97e0987ee7561a295651 Mon Sep 17 00:00:00 2001 From: k94314517 <8417338+k94314517@user.noreply.gitee.com> Date: 星期五, 04 七月 2025 17:56:41 +0800 Subject: [PATCH] git ch --- server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyOnServiceImpl.java | 62 ++++++++++++++++++++++++++++--- 1 files changed, 56 insertions(+), 6 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyOnServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyOnServiceImpl.java index fc37177..782660c 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyOnServiceImpl.java +++ b/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); @@ -1022,6 +1033,45 @@ } + + @Override + public DataListVO getCompanyMiniData(){ + LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal(); + DataListVO dataListVO = new DataListVO(); + dataListVO.setDataFirst("0"); + dataListVO.setDataSecond("0"); + dataListVO.setDataThird("0"); + + dataListVO.setDataFirst( + insuranceApplyMapper.selectCount(new QueryWrapper<InsuranceApply>().lambda() + .eq(InsuranceApply::getCompanyId,loginUserInfo.getCompanyId()) + .eq(InsuranceApply::getIsdeleted,Constants.ZERO) + .in(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey(),Constants.InsuranceApplyStatus.WTB_DONE.getKey()) + .apply(" start_time <= now() and end_time >= now() ") + ).toString() + ); + dataListVO.setDataSecond( + applyDetailJoinMapper.selectJoinCount( new MPJLambdaWrapper<ApplyDetail>() + .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.start_time <= now() and t.end_time >= now() ") + ).toString() + ); + dataListVO.setDataThird( + settleClaimsMapper.selectCount(new QueryWrapper<SettleClaims>().lambda() + .eq(SettleClaims::getIsdeleted,Constants.ZERO) + .eq(SettleClaims::getCompanyId,loginUserInfo.getCompanyId()) + .notIn(SettleClaims::getStatus,Constants.SettleClaimsStatus.WAIT_ACCEPTANCE.getKey(),Constants.SettleClaimsStatus.REJECT_DEAL.getKey() + ,Constants.SettleClaimsStatus.WAIT_DISCUSS_REJECT.getKey(),Constants.SettleClaimsStatus.CLOSE_CASE.getKey(),Constants.SettleClaimsStatus.RETURN.getKey()) + + ).toString() + ); + return dataListVO; + } + } -- Gitblit v1.9.3