From f625df7f9180e19deb502660a64e2f65dd5f52e6 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期一, 01 四月 2024 15:02:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/business/impl/UnionApplyServiceImpl.java | 58 +++++++++++++++++++++++++++++++++++++++++-----------------
1 files changed, 41 insertions(+), 17 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 04b339c..6f22a3c 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
@@ -147,13 +147,18 @@
MPJLambdaWrapper<UnionApply> queryWrapper = new MPJLambdaWrapper<>();
Utils.MP.blankToNull(pageWrap.getModel());
queryWrapper.selectAll(UnionApply.class);
+ queryWrapper.selectAs(Solutions::getName,UnionApply::getSolutionName);
+ 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();
- if(user.getType().equals(Constants.TWO)){
- queryWrapper.eq(UnionApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ if(Constants.equalsInteger(user.getType(),Constants.TWO)){
+ queryWrapper.eq(UnionApply::getCompanyId, user.getCompanyId());
}
if (pageWrap.getModel().getId() != null) {
queryWrapper.eq(UnionApply::getId, pageWrap.getModel().getId());
+ }
+ if (pageWrap.getModel().getSolutionId() != null) {
+ queryWrapper.eq(UnionApply::getSolutionId, pageWrap.getModel().getSolutionId());
}
if (pageWrap.getModel().getCreator() != null) {
queryWrapper.eq(UnionApply::getCreator, pageWrap.getModel().getCreator());
@@ -219,14 +224,18 @@
}
if (pageWrap.getModel().getSignApplyNo() != null) {
queryWrapper.eq(UnionApply::getSignApplyNo, pageWrap.getModel().getSignApplyNo());
- }
- for(PageWrap.SortData sortData: pageWrap.getSorts()) {
- if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
- queryWrapper.orderByDesc(sortData.getProperty());
- } else {
- queryWrapper.orderByAsc(sortData.getProperty());
+ }if(pageWrap.getSorts().size() == 0){
+ queryWrapper.orderByDesc(UnionApply::getCreateDate );
+ }else {
+ for(PageWrap.SortData sortData: pageWrap.getSorts()) {
+ if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
+ queryWrapper.orderByDesc(sortData.getProperty());
+ } else {
+ queryWrapper.orderByAsc(sortData.getProperty());
+ }
}
}
+
PageData<UnionApply> pageData = PageData.from(unionApplyJoinMapper.selectJoinPage(page,UnionApply.class, queryWrapper));
return pageData;
}
@@ -273,6 +282,7 @@
@Override
+ @Transactional(rollbackFor ={BusinessException.class,Exception.class} )
public Integer merge(SaveUnionApplyDTO saveUnionApplyDTO){
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(!user.getType().equals(Constants.TWO)){
@@ -280,16 +290,27 @@
}
if(Objects.isNull(saveUnionApplyDTO)
|| Objects.isNull(saveUnionApplyDTO.getApplyIds())
+ || saveUnionApplyDTO.getApplyIds().size() == 0
|| Objects.isNull(saveUnionApplyDTO.getStartDate())
|| Objects.isNull(saveUnionApplyDTO.getEndDate())
+ || saveUnionApplyDTO.getStartDate().getTime()>saveUnionApplyDTO.getEndDate().getTime()
|| Objects.isNull(saveUnionApplyDTO.getBaseSolutionId())
){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
+ Solutions solutions = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().
+ eq(Solutions::getType,Constants.ONE)
+ .eq(Solutions::getIsdeleted,Constants.ZERO)
+ .eq(Solutions::getDataType,Constants.ZERO)
+ .eq(Solutions::getBaseId,saveUnionApplyDTO.getBaseSolutionId()));
+ //鏌ヨ鏂规鏁版嵁
+ if(solutions == null){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝鏂规淇℃伅鏈夎锛岃鍒锋柊椤甸潰閲嶈瘯");
+ }
List<InsuranceApply> insuranceApplyList = insuranceApplyJoinMapper.selectJoinList(InsuranceApply.class,
new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
- .selectAs(InsuranceApply::getSolutionBaseId,Solutions::getBaseId)
+ .selectAs(Solutions::getBaseId,InsuranceApply::getSolutionBaseId)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.eq(InsuranceApply::getIsdeleted, Constants.ZERO)
.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey())
@@ -312,11 +333,19 @@
unionApply.setStatus(Constants.UnionApplyStatus.MERGE.getKey());
unionApply.setCheckUserId(user.getId());
unionApply.setCurrentFee(BigDecimal.ZERO);
+ unionApply.setIsdeleted(Constants.ZERO);
+ unionApply.setSolutionId(solutions.getId());
Integer maxDays = DateUtil.calculateBetween(saveUnionApplyDTO.getStartDate(),saveUnionApplyDTO.getEndDate(),0);
- List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().select(ApplyDetail::getPrice)
- .in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds()));
- unionApply.setFee(applyDetailList.stream().map(i->i.getPrice().multiply(new BigDecimal(maxDays))).reduce(BigDecimal.ZERO,BigDecimal::add));
+
+ List<ApplyDetail> applyDetailList = applyDetailJoinMapper.selectList(new QueryWrapper<ApplyDetail>().lambda().select(ApplyDetail::getId,ApplyDetail::getPrice)
+ .in(ApplyDetail::getApplyId,saveUnionApplyDTO.getApplyIds())
+ .eq(ApplyDetail::getIsdeleted,Constants.ZERO));
+ if(applyDetailList.size()==0){
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"瀵逛笉璧凤紝瀛樺湪濮旀墭鎶曚繚鐢宠璁板綍淇℃伅鏈夎锛岃杩斿洖鏌ョ湅鐢宠浜哄憳鏄惁涓虹┖锛�");
+ }
+ unionApply.setFee(applyDetailList.stream().map(i->Constants.formatBigdecimal(i.getPrice()).multiply(new BigDecimal(maxDays))).reduce(BigDecimal.ZERO,BigDecimal::add));
+
unionApplyMapper.insert(unionApply);
insuranceApplyJoinMapper.update(null,new UpdateWrapper<InsuranceApply>().lambda()
@@ -464,16 +493,11 @@
multifile.setFileurl(uploadMultifileDTO.getFileurl());
multifile.setName(uploadMultifileDTO.getName());
multifileMapper.insert(multifile);
-
-
-
-
}
/**
* 鍚堝苟鍗� - 鎶曚繚鐢宠绛剧讲
- * @param id
* @return
*/
@Override
--
Gitblit v1.9.3