From c28a6a9f00376a13781bfab55adaf401cd651336 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期日, 07 四月 2024 15:25:27 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 77 ++++++++++++++++++++++++++++++--------
1 files changed, 60 insertions(+), 17 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 c50290c..fe9edfc 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
@@ -105,6 +105,8 @@
private UnionApplyJoinMapper unionApplyJoinMapper;
@Autowired
private UnionChangeJoinMapper unionChangeJoinMapper;
+ @Autowired
+ private CompanySolutionMapper companySolutionMapper;
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
@@ -129,7 +131,8 @@
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()))){
+ || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+ || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey()))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀵逛笉璧凤紝璇ョ敵璇风姸鎬佸凡娴佽浆锛屽綋鍓嶄笉鏀寔璇ユ搷浣渵");
}
update.setStatus(Constants.InsuranceApplyStatus.WTB_RETURN.getKey());
@@ -523,15 +526,22 @@
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.ZERO,model.getId(),model.getSolutionsName(),model.getCompanyId(),Constants.NoticeType.TWO);
noticesMapper.insert(notices);
- Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
- if(Objects.nonNull(solutions)&&Objects.nonNull(solutions.getShopId())){
- Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,model.getId(),model.getSolutionsName(),solutions.getShopId(),Constants.NoticeType.TWO);
+
+ CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+ .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+ .eq(CompanySolution::getSolutionId,model.getSolutionId())
+ .eq(CompanySolution::getCompanyId,model.getCompanyId())
+ .last("limit 1")
+ );
+ //鍟嗘埛寰呭姙
+ if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
+ Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+ model.getId(),model.getSolutionsName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
noticesMapper.insert(shopNotices);
}
-
-
Multifile f = new Multifile();
f.setIsdeleted(Constants.ZERO);
@@ -1465,6 +1475,8 @@
applyLogType = Constants.ApplyLogType.PLATFORM_CHECK_PASS;
if(Constants.equalsObject(solutions.getType(),Constants.ONE)){
update.setStatus(Constants.InsuranceApplyStatus.WTB_BUSINESS_CHECK_PASS.getKey());
+ }else{
+ update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey());
}
}
insuranceApplyMapper.updateById(update);
@@ -1578,10 +1590,16 @@
//瀛樺偍骞冲彴寰呭姙
Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),insuranceApply.getCompanyId(),Constants.NoticeType.ZERO);
noticesMapper.insert(notices);
+ CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+ .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+ .eq(CompanySolution::getSolutionId,solutions.getId())
+ .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
+ .last("limit 1")
+ );
//鍟嗘埛寰呭姙
- if(Objects.nonNull(solutions.getShopId())){
+ if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
- insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.ZERO);
+ insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.ZERO);
noticesMapper.insert(shopNotices);
}
}
@@ -2330,7 +2348,10 @@
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()))){
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.SIGNATURE.getKey()))
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+ || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+ || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�侀潪鍙敵璇烽��鍥�!");
}
if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.UPLOAD.getKey())){
@@ -2343,20 +2364,42 @@
insuranceApplyStatus = Constants.InsuranceApplyStatus.COMPANY_BACK_APPLY_PASS;
}
+ else if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_UPLOAD.getKey())
+ || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey())
+ || insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey())){
+ insuranceApplyStatus = Constants.InsuranceApplyStatus.WTB_RETURN;
+ }
+
//瀛樺偍寰呭姙淇℃伅
//鍒犻櫎鍏朵粬寰呭姙
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.ZERO,insuranceApply.getId(),solutions.getName(),
- insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
- noticesMapper.insert(notices);
- //鍟嗘埛寰呭姙
- if(Objects.nonNull(solutions.getShopId())){
- Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
- insuranceApply.getId(),solutions.getName(),solutions.getShopId(),Constants.NoticeType.THREE);
- noticesMapper.insert(shopNotices);
+ if(!loginUserInfo.getCompanyId().equals(insuranceApply.getCompanyId())){
+ Notices notices = new Notices(noticeObjectType,Constants.ZERO,insuranceApply.getId(),solutions.getName(),
+ insuranceApply.getCompanyId(), Constants.NoticeType.THREE);
+ noticesMapper.insert(notices);
}
+
+
+// CompanySolution companySolution = companySolutionMapper.selectOne(new QueryWrapper<CompanySolution>().lambda()
+// .eq(CompanySolution::getIsdeleted,Constants.ZERO)
+// .eq(CompanySolution::getSolutionId,solutions.getId())
+// .eq(CompanySolution::getCompanyId,insuranceApply.getCompanyId())
+// .last("limit 1")
+// );
+// //鍟嗘埛寰呭姙
+// if(Objects.nonNull(companySolution)&&Objects.nonNull(companySolution.getShopId())){
+// Notices shopNotices = new Notices(noticeObjectType,Constants.TWO,
+// insuranceApply.getId(),solutions.getName(),companySolution.getShopId(),Constants.NoticeType.THREE);
+// noticesMapper.insert(shopNotices);
+// }
+
+
+
+
+
+
}else if(insuranceApplyOptDTO.getOptType().equals(Constants.TWO)){
insuranceApplyStatus = Constants.InsuranceApplyStatus.CLOSE;
if(insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.CLOSE.getKey())){
--
Gitblit v1.9.3