From 0a4c7c2b7a73b89c9ac3845f98cac96765a78384 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期三, 03 四月 2024 10:21:54 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 34 ++++++++++++++++++++++------------
1 files changed, 22 insertions(+), 12 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 68e0d51..4d5ee27 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
@@ -113,24 +113,30 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
-
if(model == null ||!Constants.equalsInteger(model.getIsdeleted(),Constants.ZERO)){
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
- if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
- }
-
Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
if(Objects.isNull(solutions)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈡柟妗堜俊鎭�");
}
-
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
InsuranceApply update = new InsuranceApply();
+ if(Constants.equalsInteger(solutions.getType(),Constants.ZERO)){
+ if(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
+ }else{
+ if( !(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())
+ || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey()))){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
+ }
+ update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
+ }
+
update.setEditDate(new Date());
update.setEditor(user.getId());
- update.setStatus(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo(insuranceApply.getCheckInfo());
update.setCheckUserId(user.getId());
@@ -608,7 +614,7 @@
f.setCreator(model.getCreator());
f.setObjId(update.getId());
f.setCreateDate(update.getEditDate());
- f.setObjType(Constants.MultiFile.COMPANY_TBD_SIGNED_PDF.getKey());
+ f.setObjType(Constants.MultiFile.BD_SIGNED_PDF.getKey());
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullUrl);
@@ -738,7 +744,7 @@
ApplyChange update = new ApplyChange();
update.setEditDate(new Date());
update.setEditor(model.getCreator());
- update.setStatus(Constants.ApplyChangeStatus.COMPANY_SIGN.getKey());
+ update.setStatus(Constants.ApplyChangeStatus.SIGNATURE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
update.setCheckUserId(model.getCreator());
@@ -1533,6 +1539,7 @@
insuranceApply.setCurrentFee(BigDecimal.ZERO);
insuranceApply.setCheckUserId(loginUserInfo.getId());
insuranceApply.setStatus(insuranceApplyStatus.getKey());
+ insuranceApply.setUnionApplyTbdStatus(Constants.ZERO);
CountCyclePriceDTO countCyclePriceDTO = new CountCyclePriceDTO();
countCyclePriceDTO.setSolutionsId(insuranceApply.getSolutionId());
@@ -1887,6 +1894,7 @@
queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
queryWrapper.eq(pageWrap.getModel().getBaseSolutionId()!=null,Solutions::getBaseId,pageWrap.getModel().getBaseSolutionId());
queryWrapper.in(statusList.size()>0,InsuranceApply::getStatus,statusList);
+ queryWrapper.like(StringUtils.isNotBlank(pageWrap.getModel().getSolutionName()),Solutions::getName,pageWrap.getModel().getSolutionName());
if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.THREE) ){
queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
@@ -1987,11 +1995,13 @@
@Override
public List<InsuranceApply> findListByDTO(InsuranceApplyQueryDTO model) {
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+
MPJLambdaWrapper<InsuranceApply> queryWrapper = new MPJLambdaWrapper<>();
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 count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum");
queryWrapper.select(" ( select max(ac.APPLY_START_TIME) from apply_change ac where ac.apply_id = t.id and ac.status = 2 ) as lastChangeDate");
queryWrapper.select(" ( select sum(td.fee) from taxes ts inner join tax_detial td on td.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 td.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 ");
@@ -2066,7 +2076,7 @@
List<Integer> objList = new ArrayList<>();
if(list!=null && list.size()>0){
for(InsuranceApply param : list){
- objList.get(param.getId());
+ objList.add(param.getId());
}
}else{
return;
@@ -2687,7 +2697,7 @@
Constants.ApplyLogType applyLogType = null;
String info = "";
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())){
+ if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_TOUBAOING.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
Company company = user.getCompany();
@@ -2699,7 +2709,7 @@
}
Multifile f = multifileMapper.selectOne(new QueryWrapper<Multifile>().lambda()
.eq(Multifile::getObjId,model.getId())
- .eq(Multifile::getObjType,Constants.MultiFile.COMPANY_TBD_SIGNED.getKey())
+ .eq(Multifile::getObjType,Constants.MultiFile.BD_APPLY_PDF.getKey())
.eq(Multifile::getIsdeleted,Constants.ZERO).last("limit 1"));
if(f == null || StringUtils.isBlank(f.getFileurl())){
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"瀵逛笉璧凤紝鑾峰彇纭涔︽枃浠跺け璐ワ紝璇疯仈绯诲晢鎴风‘璁ゆ姇淇濈敵璇蜂功鏄惁姝ｇ‘锛�");
--
Gitblit v1.9.3