From 520433f6d88c1f4c1a2d31ca950f2309da2d4a9a Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期二, 01 七月 2025 14:02:25 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyOnServiceImpl.java | 23 +++++++++++++++++------
1 files changed, 17 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 ece16af..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);
--
Gitblit v1.9.3