From 77f12a8d0375087db4ba68fba26825ddc7bd183e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 03 四月 2024 16:19:41 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 14 ++++++++++++--
1 files changed, 12 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 5caee2c..54f5b85 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
@@ -146,7 +146,14 @@
MPJLambdaWrapper<UnionApply> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(UnionApply.class);
- queryWrapper.selectAs(Solutions::getName,UnionApply::getSolutionName);
+ queryWrapper.selectAs(Solutions::getName,UnionApply::getSolutionName)
+ .selectAs(Solutions::getMaxAge,UnionApply::getMaxAge)
+ .selectAs(Solutions::getMinAge,UnionApply::getMinAge)
+ .selectAs(Solutions::getPrice,UnionApply::getPrice)
+ .selectAs(Solutions::getTimeUnit,UnionApply::getTimeUnit)
+ .selectAs(Solutions::getOrtherInfo,UnionApply::getOrtherInfo)
+ .selectAs(Solutions::getSpecialAgreement,UnionApply::getSpecialAgreement)
+ .selectAs(Solutions::getSpecialInfo,UnionApply::getSpecialInfo);
queryWrapper.select("(select count(b.id) from apply_detail b where b.isdeleted=0 and b.union_apply_id=t.id) as insureNum ");
queryWrapper.leftJoin(Solutions.class,Solutions::getId,UnionApply::getSolutionId);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -409,7 +416,7 @@
if(insuranceApplyList.size()!=saveUnionApplyDTO.getApplyIds().size()){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀛樺湪鏁版嵁宸插鐞嗭紝璇峰埛鏂伴噸璇�");
}
-
+ saveUnionApplyDTO.setEndDate(DateUtil.getMontageDate(saveUnionApplyDTO.getEndDate(),2));
UnionApply unionApply = new UnionApply();
unionApply.setCreateDate(new Date());
unionApply.setCreator(user.getId());
@@ -768,6 +775,7 @@
.filter(m->Constants.equalsInteger(m.getApplyId(),(insuranceApply.getId()))).collect(Collectors.toList());
//鏇存柊鎶曚繚鐢宠鍗�
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
+ .set(InsuranceApply::getUnionApplyTbdStatus,Constants.THREE)
.set(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_DONE.getKey())
.set(InsuranceApply::getFee,price.multiply(new BigDecimal(applyDetails.size())).multiply(new BigDecimal(maxDays)))
.set(InsuranceApply::getCurrentFee,currentFee.multiply(new BigDecimal(applyDetails.size())))
@@ -775,6 +783,7 @@
.set(InsuranceApply::getEndTime,unionApplyBXDDTO.getEndTime())
.set(InsuranceApply::getEditDate,new Date())
.set(InsuranceApply::getEditor,user.getId())
+ .set(InsuranceApply::getCode,unionApplyBXDDTO.getCode())
.eq(InsuranceApply::getId,insuranceApply.getId()));
//鏇存柊鎶曚繚鍗曟槑缁嗛噾棰�
applyDetailJoinMapper.update(null,new UpdateWrapper<ApplyDetail>().lambda()
@@ -798,6 +807,7 @@
.set(UnionApply::getEditor,user.getId())
.set(UnionApply::getStartTime,unionApplyBXDDTO.getStartTime())
.set(UnionApply::getEndTime,unionApplyBXDDTO.getEndTime())
+ .set(UnionApply::getCode,unionApplyBXDDTO.getCode())
.set(UnionApply::getFee,sumFee)
.set(UnionApply::getCurrentFee,sumCurrFee)
.eq(UnionApply::getId,unionApply.getId())
--
Gitblit v1.9.3