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/UnionChangeServiceImpl.java | 4 +++-
1 files changed, 3 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
index 9a87958..7f8d9fe 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/UnionChangeServiceImpl.java
@@ -248,12 +248,14 @@
queryWrapper.selectAll(UnionChange.class);
pageWrap.getModel().setIsdeleted(Constants.ZERO);
queryWrapper.selectAs(UnionApply::getCode,UnionChange::getApplyCode);
- queryWrapper.selectAs(Solutions::getName,UnionChange::getSolutionsName)
+ queryWrapper.selectAs(Solutions::getName,UnionChange::getSolutionsName)
+ .select(" (select c.NAME from insurance_apply i left join company c on i.COMPANY_ID = c.id where i.UNION_APPLY_ID = t.UNION_APPLY_ID limit 1 ) ",UnionApply::getCompanyName)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 0 )",UnionChange::getAddNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 1 )",UnionChange::getDelNum)
.select("( select count(1) from apply_chagne_detail ad where t.id = ad.UNION_CHANGE_ID and ad.TYPE = 2 )",UnionChange::getChangeNum);
queryWrapper.leftJoin(UnionApply.class,UnionApply::getId,UnionChange::getUnionApplyId);
queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
+ queryWrapper.leftJoin(Company.class,Company::getId,UnionApply::getCompanyId);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
queryWrapper.eq(UnionChange::getShopId, user.getCompanyId());
--
Gitblit v1.9.3