From 5337d6006b45ca61881623ad2e8738e03ad3bde2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 16 六月 2025 11:46:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
index fa6fa88..f742dc0 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java
@@ -161,7 +161,8 @@
.selectAs(Solutions::getTimeUnit,UnionApply::getTimeUnit)
.selectAs(Solutions::getOrtherInfo,UnionApply::getOrtherInfo)
.selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
- .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
+ .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo)
+ .select(" (select c.NAME from insurance_apply i left join company c on i.COMPANY_ID = c.id where i.UNION_APPLY_ID = t.id limit 1 ) ",UnionApply::getCompanyName);
queryWrapper.select("(select count(distinct(b.MEMBER_ID)) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
queryWrapper.select(" ( select count(DISTINCT(b.MEMBER_ID)) from apply_detail b inner join insurance_apply a on b.apply_id = a.id and a.status in ( 5 , 27 ) where b.union_apply_id=t.id and b.END_TIME > now() ) as guaranteeNum");
@@ -180,7 +181,7 @@
queryWrapper.select("(select count(1) from apply_change a inner join insurance_apply b on a.apply_id = b.id where b.union_apply_id=t.id " +
"and b.status = "+Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey()+" and a.type = 1 ) as changeApplyNum ");
}
- queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
+ queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
queryWrapper.eq(UnionApply::getCompanyId, user.getCompanyId());
--
Gitblit v1.9.3