From 6b63f7cb1a90b2b365ed9a6baafa406f6ef98c1d Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期日, 07 四月 2024 18:41:08 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 136 +++++++++++++++++++++++++++++++++------------
1 files changed, 100 insertions(+), 36 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 ebd3268..7c6daa2 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})
@@ -113,24 +115,31 @@
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())
+ || Constants.equalsInteger(model.getStatus(),Constants.InsuranceApplyStatus.WTB_UPLOAD.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());
@@ -517,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);
@@ -738,7 +754,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());
@@ -750,7 +766,11 @@
f.setCreator(model.getCreator());
f.setObjId(update.getId());
f.setCreateDate(update.getEditDate());
- f.setObjType(Constants.MultiFile.CHANGE_MEMBER_LIST_LATTER.getKey());
+ if(model.getType().equals(Constants.ZERO)){
+ f.setObjType(Constants.MultiFile.CA_APPLY_JIAJIAN_SIGN.getKey());
+ }else{
+ f.setObjType(Constants.MultiFile.CA_APPLY_CHANGEUNIT_SIGN.getKey());
+ }
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullurl);
@@ -842,8 +862,8 @@
f.setType(Constants.TWO);
f.setFileurl(fileurl);
f.setFileurlFull(fullUrl);
- f.setInfo("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�");
- f.setName("濮旀墭鍔犲噺淇�/鎹㈠巶涓氬姟 -鎶曚繚鍗�.pdf");
+ f.setInfo("鎶曚繚鐢宠鍗� -鐢宠鍗�");
+ f.setName("鎶曚繚鐢宠鍗�.pdf");
multifileMapper.insert(f);
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.CA_HBD_SIGNATURE_TBD;
@@ -1455,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);
@@ -1568,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);
}
}
@@ -1844,17 +1872,17 @@
return new ArrayList<>();
}
List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
- if(collectStatus.equals(Constants.ApplyCollectStatus.DCD)){
+ if(collectStatus.equals(Constants.ApplyCollectStatus.DCD.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP)){
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ)){
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH)){
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB)){
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ)){
+ }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
}
@@ -1889,9 +1917,14 @@
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());
+ if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.YGQ.getKey()) ){
+ //濡傛灉鏄凡閬庢湡
+// queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
queryWrapper.lt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
+ }else if(Constants.equalsInteger(pageWrap.getModel().getStatusCollect(),Constants.ApplyCollectStatus.BZZ.getKey()) ){
+ //濡傛灉鏄繚闅滀腑
+// queryWrapper.eq(InsuranceApply::getStatus,Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
+ queryWrapper.gt(InsuranceApply::getEndTime, Utils.Date.getStart(new Date()));
}
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
@@ -1989,6 +2022,7 @@
@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);
@@ -2002,6 +2036,7 @@
queryWrapper.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId);
queryWrapper.eq(InsuranceApply::getIsdeleted,Constants.ZERO);
queryWrapper.eq(model.getUnionApplyId()!=null,InsuranceApply::getUnionApplyId, model.getUnionApplyId());
+ queryWrapper.eq(model.getBaseSolutionId()!=null,Solutions::getBaseId,model.getBaseSolutionId());
//浼佷笟浜哄憳鏌ョ湅鏈紒涓氭暟鎹�
if(loginUserInfo.getType().equals(Constants.ONE)){
queryWrapper.eq(InsuranceApply::getCompanyId, loginUserInfo.getCompanyId());
@@ -2259,6 +2294,7 @@
MPJLambdaWrapper wrapper= new MPJLambdaWrapper<InsuranceApply>()
.selectAll(InsuranceApply.class)
.selectAs(Solutions::getName,InsuranceApply::getSolutionsName)
+ .selectAs(Solutions::getType,InsuranceApply::getSolutionType)
.selectAs(Company::getName,InsuranceApply::getCompanyName)
.leftJoin(Solutions.class,Solutions::getId,InsuranceApply::getSolutionId)
.leftJoin(Company.class,Company::getId,InsuranceApply::getCompanyId)
@@ -2318,7 +2354,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())){
@@ -2331,20 +2370,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())){
@@ -2353,7 +2414,10 @@
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()))){
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.PLATFORM_CHECK_PASS.getKey())
+ ||insuranceApply.getStatus().equals(Constants.InsuranceApplyStatus.WTB_RETURN.getKey())
+ )
+ ){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏁版嵁鐘舵�佹棤娉曡繘琛屽叧闂�!");
}
//鍒犻櫎鍏朵粬寰呭姙
--
Gitblit v1.9.3