From 979675ddbb8c6cb59fc1d074e1c47f7c1da282a1 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 15 三月 2024 17:09:33 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 11 ++++++++++-
1 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
index d5f232d..ab2102e 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java
@@ -1169,6 +1169,7 @@
queryWrapper.selectAll(InsuranceApply.class);
queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
+ queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType);
queryWrapper.selectAs(Solutions::getMaxAge,InsuranceApply::getMaxAge);
queryWrapper.selectAs(Solutions::getMinAge,InsuranceApply::getMinAge);
queryWrapper.selectAs(Solutions::getPrice,InsuranceApply::getPrice);
@@ -1203,6 +1204,9 @@
}
if (pageWrap.getModel().getSolutionId() != null) {
queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
+ }
+ if (pageWrap.getModel().getSolutionType() != null) {
+ queryWrapper.eq(Solutions::getType, pageWrap.getModel().getSolutionType());
}
if (pageWrap.getModel().getEndTimeS() != null) {
queryWrapper.ge(InsuranceApply::getEndTime, Utils.Date.getStart(pageWrap.getModel().getEndTimeS()));
@@ -1275,6 +1279,7 @@
queryWrapper.selectAll(InsuranceApply.class);
queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
+ queryWrapper.selectAs(Solutions::getType,InsuranceApply::getSolutionType);
queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id ) as taxesMoney ");
queryWrapper.select(" ( select td.CREATE_DATE from taxes ts inner join tax_detial td on ts.TAX_ID = ts.id where ts.status != 2 and td.INSURANCE_APPLY_ID = t.id order by td.CREATE_DATE desc limit 1 ) as taxesLast ");
queryWrapper.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId);
@@ -1292,6 +1297,9 @@
}
if (model.getSolutionId() != null) {
queryWrapper.eq(InsuranceApply::getSolutionId, model.getSolutionId());
+ }
+ if (model.getSolutionType() != null) {
+ queryWrapper.eq(Solutions::getType,model.getSolutionType() );
}
if (model.getEndTimeS() != null) {
queryWrapper.ge(InsuranceApply::getEndTime, Utils.Date.getStart(model.getEndTimeS()));
@@ -1345,6 +1353,7 @@
.selectAs(Solutions::getMinAge,InsuranceApply::getMinAge)
.selectAs(Solutions::getPrice,InsuranceApply::getPrice)
.selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit)
+ .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate")
@@ -1415,7 +1424,7 @@
private void initImgData(InsuranceApply model) {
List<Multifile> multifiles = multifileMapper.selectList(new QueryWrapper<Multifile>().lambda()
- .eq(Multifile::getObjId,model.getId())
+ .eq(Multifile::getObjId,Constants.equalsInteger(model.getSolutionType(),Constants.ZERO)? model.getId():model.getUnionApplyId())
.in(Multifile::getObjType,Arrays.asList(new Integer[]{Constants.MultiFile.BD_APPLY_PDF.getKey()
,Constants.MultiFile.BD_SIGNED_PDF.getKey()
,Constants.MultiFile.BD_DONE_PDF.getKey()}))
--
Gitblit v1.9.3