From 22271e641e4505ba906c3770905b7e84e3ad8d85 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 02 四月 2024 17:05:57 +0800
Subject: [PATCH] mrshi
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 99 ++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 80 insertions(+), 19 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 3f8a428..d5f232d 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
@@ -214,7 +214,7 @@
String info = "";
if(model.getApplyStartTime()!=null && model.getApplyStartTime().getTime()/1000!= insuranceApply.getStartTime().getTime()/1000){
info =applyLogType.getInfo();
- info = info.replace("${param1}",DateUtil.getPlusTime2(model.getApplyEndTime()));
+ info = info.replace("${param1}",DateUtil.getPlusTime2(model.getStartTime()));
info = info.replace("${param2}",DateUtil.getPlusTime2(insuranceApply.getStartTime()));
}
ApplyLog log = new ApplyLog(update,applyLogType.getName(), info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
@@ -244,6 +244,7 @@
List<MemberInsurance> memberInsuranceList = new ArrayList<>();
for (ApplyDetail applyDetail:applyDetailList) {
MemberInsurance memberInsurance = new MemberInsurance(applyDetail,user.getId());
+ memberInsurance.setRelationType(Constants.ZERO);
memberInsuranceList.add(memberInsurance);
}
memberInsuranceJoinMapper.insertBatchSomeColumn(memberInsuranceList);
@@ -282,6 +283,13 @@
update.setId(model.getId());
update.setCode(param.getCode());
insuranceApplyMapper.updateById(update);
+ //淇敼鍛樺伐淇濆崟璁板綍
+ memberInsuranceJoinMapper.update(null,new UpdateWrapper<MemberInsurance>()
+ .lambda()
+ .set(MemberInsurance::getBdCode,param.getCode())
+ .eq(MemberInsurance::getApplyId,model.getId())
+ );
+
//鍒犻櫎鍘熸湁鐨勪繚鍗曚俊鎭�
multifileMapper.delete(new UpdateWrapper<Multifile>().lambda()
.set(Multifile::getIsdeleted,Constants.ZERO)
@@ -324,13 +332,25 @@
InsuranceApply update = new InsuranceApply();
if(insuranceApply.getDealBackApply() ==1){
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
- if(!Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())){
+ if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())||
+ Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())||
+ Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_UPLOAD.getKey())||
+ Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS.getKey()))
+ ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
applyLogType = Constants.ApplyLogType.PLATFORM_UN_AGREE_BACK;
info = applyLogType.getInfo();
info = info.replace("${param}", insuranceApply.getCheckInfo());
- update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
+ if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())){
+ update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
+ }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())){
+ update.setStatus(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey());
+ }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_UPLOAD.getKey())){
+ update.setStatus(Constants.InsuranceApplyStatus.UPLOAD.getKey());
+ }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS.getKey())){
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
+ }
}else{
//濡傛灉鏄悓鎰�,涓ょ鐢宠閫�鍥炵姸鎬侀兘鍙搷浣�
if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())
@@ -339,13 +359,7 @@
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK;
- if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE.getKey())){
- update.setStatus(Constants.InsuranceApplyStatus.SIGNATURE.getKey());
- }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE.getKey())){
- update.setStatus(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey());
- }else if( Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_UPLOAD.getKey())){
- update.setStatus(Constants.InsuranceApplyStatus.UPLOAD.getKey());
- }
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
}
update.setEditDate(new Date());
update.setEditor(user.getId());
@@ -686,9 +700,16 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
if(!(Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.UPLOAD.getKey())
+ || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
|| Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.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();
update.setEditDate(new Date());
@@ -727,6 +748,12 @@
Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
+ Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),
+ model.getCompanyId(), Constants.NoticeType.ONE);
+ noticesMapper.insert(notices);
+
+
+
return 1;
}
@@ -739,7 +766,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public Integer check(InsuranceApply insuranceApply) {
- if(insuranceApply.getId() == null || StringUtils.isBlank(insuranceApply.getCheckInfo())){
+ if(insuranceApply.getId() == null){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
InsuranceApply model = insuranceApplyMapper.selectById(insuranceApply.getId());
@@ -784,11 +811,15 @@
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
.eq(Notices::getObjId,model.getId()));
- Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),model.getCompanyId(),noticeType);
- noticesMapper.insert(notices);
+// Notices notices = new Notices(noticeObjectType,Constants.ONE,model.getId(),solutions.getName(),model.getCompanyId(),noticeType);
+// noticesMapper.insert(notices);
String info =applyLogType.getInfo();
- info = info.replace("${param}", update.getCheckInfo());
+ if(StringUtils.isNotBlank(update.getCheckInfo())){
+ info = info.replace("${param}", update.getCheckInfo());
+ }else{
+ info = null;
+ }
ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
return 1;
@@ -1138,11 +1169,15 @@
queryWrapper.selectAll(InsuranceApply.class);
queryWrapper.selectAs(Company::getName,InsuranceApply::getCompanyName);
queryWrapper.selectAs(Solutions::getName,InsuranceApply::getSolutionsName);
+ queryWrapper.selectAs(Solutions::getMaxAge,InsuranceApply::getMaxAge);
+ queryWrapper.selectAs(Solutions::getMinAge,InsuranceApply::getMinAge);
+ queryWrapper.selectAs(Solutions::getPrice,InsuranceApply::getPrice);
+ queryWrapper.selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit);
queryWrapper.select(" DATEDIFF( t.END_TIME ,now() ) AS loseEfficacyDays ");
queryWrapper.select(" ( select count(DISTINCT(ad.MEMBER_ID)) from apply_detail ad where ad.apply_id = t.id ) as insureNum");
if(!Objects.isNull(pageWrap.getModel())&&!Objects.isNull(pageWrap.getModel().getType())){
- queryWrapper.select(" ifnull(( 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 ),0) 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 ");
+ queryWrapper.select(" ifnull(( select sum(td.fee) from taxes ts inner join tax_detial td on td.TAX_ID = ts.id where ts.status = 1 and td.INSURANCE_APPLY_ID = t.id ),0) 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 = 1 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);
queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
@@ -1195,6 +1230,9 @@
}
if (pageWrap.getModel().getStatus() != null) {
queryWrapper.in(InsuranceApply::getStatus, pageWrap.getModel().getStatus().split(","));
+ }
+ if (pageWrap.getModel().getLoseEfficacy() != null && pageWrap.getModel().getLoseEfficacy() ==1) {
+ queryWrapper.apply(" DATEDIFF(t.END_TIME,CURRENT_DATE() ) <= 5 and t.END_TIME >= now() ");
}
if(CollectionUtils.isNotEmpty(pageWrap.getSorts())){
for(PageWrap.SortData sortData: pageWrap.getSorts()) {
@@ -1303,6 +1341,10 @@
MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
+ .selectAs(Solutions::getMaxAge,InsuranceApply::getMaxAge)
+ .selectAs(Solutions::getMinAge,InsuranceApply::getMinAge)
+ .selectAs(Solutions::getPrice,InsuranceApply::getPrice)
+ .selectAs(Solutions::getTimeUnit,InsuranceApply::getTimeUnit)
.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")
@@ -1317,6 +1359,19 @@
throw new BusinessException(ResponseStatus.DATA_EMPTY);
}
+ Solutions solutions = solutionsMapper.selectById(insuranceApply.getSolutionId());
+ if(Objects.isNull(solutions)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规淇℃伅");
+ }
+ if(solutions.getDataType().equals(Constants.ONE)){
+ Solutions newVersionSolution = solutionsMapper.selectOne(new QueryWrapper<Solutions>().lambda().eq(Solutions::getBaseId,solutions.getBaseId()).eq(Solutions::getDataType,Constants.TWO).last("limit 1"));
+ if(Objects.isNull(newVersionSolution)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鏂规鏈�鏂扮増鏈俊鎭�");
+ }
+ insuranceApply.setNewVersionSolutionId(newVersionSolution.getId());
+ }else{
+ insuranceApply.setNewVersionSolutionId(solutions.getId());
+ }
if(insuranceApply.getStartTime().compareTo(new Date())<0 && insuranceApply.getEndTime().compareTo(new Date()) > 0 ){
insuranceApply.setLoseEfficacyDays(DateUtil.daysBetweenDates(insuranceApply.getEndTime(),new Date()));
}
@@ -1461,6 +1516,7 @@
if(insuranceApplyOptDTO.getOptType().equals(Constants.ONE)){
if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
}
@@ -1470,6 +1526,8 @@
insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_WAIT_SIGNATURE;
}else if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())){
insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_SIGNATURE;
+ }else if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())){
+ insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS;
}
//瀛樺偍寰呭姙淇℃伅
@@ -1477,7 +1535,7 @@
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
.eq(Notices::getObjId,insuranceApply.getId()));
- Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
noticesMapper.insert(notices);
@@ -1489,8 +1547,9 @@
}
if(!(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WAIT_SIGNATURE.getKey())
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.FAIL_RETURN.getKey())
||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey()))){
- throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佹棤娉曡繘琛屽叧闂�!");
}
//鍒犻櫎鍏朵粬寰呭姙
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey()).eq(Notices::getObjId,insuranceApply.getId()));
@@ -1503,7 +1562,9 @@
//瀛樺偍鏃ュ織鏁版嵁
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.COMPANY_APPLY_RETURN;
String info =applyLogType.getInfo();
- info = info.replace("${param}", insuranceApplyOptDTO.getOptIllustration());
+ if(StringUtils.isNotBlank(insuranceApplyOptDTO.getOptIllustration())){
+ info = info.replace("${param}", insuranceApplyOptDTO.getOptIllustration());
+ }
ApplyLog log = new ApplyLog(insuranceApply,applyLogType.getName(),info,insuranceApply.getId(),applyLogType.getKey(),JSONObject.toJSONString(insuranceApply), JSONObject.toJSONString(insuranceApply));
applyLogMapper.insert(log);
}
--
Gitblit v1.9.3