From 7341852b4449d689a7320b4f345ad2a10e47951e Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 12 四月 2024 18:38:03 +0800
Subject: [PATCH] git ch
---
server/service/src/main/java/com/doumee/service/business/impl/InsuranceApplyServiceImpl.java | 82 +++++++++++++++++++++++++---------------
1 files changed, 51 insertions(+), 31 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 4caeb81..3a437bb 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
@@ -388,6 +388,11 @@
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Constants.ApplyLogType applyLogType = null;
String info = "";
+ Constants.NoticeObjectType noticeObjectType = Constants.NoticeObjectType.INSURANCE_APPLY;
+ //澶勭悊閫�鍥炵敵璇烽�氱煡
+ noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
+ .ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
+ .eq(Notices::getObjId,insuranceApply.getId()));
InsuranceApply update = new InsuranceApply();
if(insuranceApply.getDealBackApply() ==1){
//濡傛灉鏄┏鍥�,鍙兘鍙┏鍥炲凡绛剧珷鐘舵�佷笅鐨勯��鍥炵敵璇风姸鎬佽繘琛屾搷浣�
@@ -419,6 +424,15 @@
}
applyLogType = Constants.ApplyLogType.PLATFORM_AGREE_BACK;
update.setStatus(Constants.InsuranceApplyStatus.PLATFORM_RETURN.getKey());
+
+
+ //閫氱煡浼佷笟 宸查��鍥�
+ Solutions solutions = solutionsMapper.selectById(model.getSolutionId());
+ if(Objects.nonNull(solutions)){
+ Notices notices = new Notices(noticeObjectType,Constants.ONE,insuranceApply.getId(),solutions.getName(),
+ insuranceApply.getCompanyId(), Constants.NoticeType.FOUR);
+ noticesMapper.insert(notices);
+ }
}
update.setEditDate(new Date());
update.setEditor(user.getId());
@@ -427,6 +441,7 @@
update.setCheckUserId(user.getId());
update.setId(model.getId());
insuranceApplyMapper.updateById(update);
+
ApplyLog log = new ApplyLog(update,applyLogType.getName(),info,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
@@ -492,6 +507,8 @@
update.setId(model.getId());
update.setEditor(user.getId());
update.setEditDate(new Date());
+ update.setCheckUserId(user.getId());
+ update.setCheckDate(new Date());
update.setSignApplyNo(applyNo);
insuranceApplyMapper.updateById(update);
return link;
@@ -583,11 +600,9 @@
public Multifile uploadFAQRSSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
- update.setEditor(model.getCreator());
update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_APPLY_SIGNATURE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo("浼佷笟瀹屾垚绛剧讲鏂规纭涔�");
- update.setCheckUserId(model.getCreator());
update.setId(model.getId());
insuranceApplyMapper.updateById(update);
@@ -605,7 +620,7 @@
multifileMapper.insert(f);
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_FAQRS;
- ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+ ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
return f;
@@ -659,7 +674,6 @@
public Multifile uploadApplyMemberListSignedFileDo(InsuranceApply model,String fileurl,String fullUrl) {
InsuranceApply update = new InsuranceApply();
update.setEditDate(new Date());
- update.setEditor(model.getCreator());
update.setStatus(Constants.InsuranceApplyStatus.WTB_COMPANY_MEMBER_LIST_SIGNATURE.getKey());
update.setCheckDate(update.getEditDate());
update.setCheckInfo("浼佷笟瀹屾垚绛剧讲浜哄憳鍚嶅崟");
@@ -684,7 +698,7 @@
//鏁版嵁鏃ュ織
Constants.ApplyLogType applyLogType = Constants.ApplyLogType.WTB_FINISH_MEMBER_LIST;
- ApplyLog log = new ApplyLog(update,applyLogType.getName(), null
+ ApplyLog log = new ApplyLog(model,applyLogType.getName(), null
,update.getId(),applyLogType.getKey(),JSONObject.toJSONString(model), JSONObject.toJSONString(update));
applyLogMapper.insert(log);
@@ -1822,7 +1836,7 @@
throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"鎶曚繚淇℃伅寮傚父锛氭�诲ぉ鏁颁笌鎬婚噾棰濋敊璇�");
}
applyDetail.setPrice(
- applyDetail.getFee().divide(new BigDecimal(maxDays),2,RoundingMode.HALF_UP)
+ applyDetail.getFee().divide(new BigDecimal(maxDays),7,RoundingMode.HALF_UP)
);
//楠岃瘉娲鹃仯鍗曚綅淇℃伅鏄惁瀛樺湪
if(duSolutionList.stream().filter(d->d.getDispatchUnitId().equals(applyDetail.getDuId())).collect(Collectors.toList()).size()<=Constants.ZERO){
@@ -1894,18 +1908,21 @@
return new ArrayList<>();
}
List<Integer> statusList = Constants.InsuranceApplyStatus.getKesByStatus(collectStatus);
- if(collectStatus.equals(Constants.ApplyCollectStatus.DCD.getKey())){
+ if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DCD.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDCD.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.DSP.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DSP.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDSH.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.BZZ.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.BZZ.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.YTH.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YTH.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYTH.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.YGB.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGB.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBYGB.getKey()));
- }else if(collectStatus.equals(Constants.ApplyCollectStatus.DQYQZ.getKey())){
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.DQYQZ.getKey())){
statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBDQS.getKey()));
+ }else if(Constants.equalsInteger(collectStatus,Constants.ApplyCollectStatus.YGQ.getKey())){
+ statusList.addAll(Constants.InsuranceApplyStatus.getKesByStatus(Constants.ApplyCollectStatus.WTBBZZ.getKey()));
+ statusList.add(Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey());
}
return statusList;
@@ -1971,6 +1988,9 @@
}
queryWrapper.eq(pageWrap.getModel().getCompanyId()!=null,InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
}
+ if (pageWrap.getModel().getCompanyId() != null) {
+ queryWrapper.eq(InsuranceApply::getCompanyId, pageWrap.getModel().getCompanyId());
+ }
if (pageWrap.getModel().getSolutionId() != null) {
queryWrapper.eq(InsuranceApply::getSolutionId, pageWrap.getModel().getSolutionId());
}
@@ -2030,7 +2050,8 @@
public void initApplyStatus(InsuranceApply apply){
apply.setStatusCollect(Constants.InsuranceApplyStatus.getCollectStatus(apply.getStatus()));
- if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())){
+ if(Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.UPLOAD_INSURANCE.getKey())
+ || Constants.equalsInteger(apply.getStatus(),Constants.InsuranceApplyStatus.WTB_DONE.getKey())){
//濡傛灉宸插畬鎴�
if(apply.getEndTime()==null || System.currentTimeMillis()>apply.getEndTime().getTime()){
apply.setStatusCollect(Constants.THREE);//宸茶繃鏈�
@@ -2404,25 +2425,24 @@
noticesMapper.delete(new QueryWrapper<Notices>().lambda().eq(Notices::getObjType,noticeObjectType.getKey())
.ne(Notices::getType,Constants.NoticeType.SIX.getStatus())
.eq(Notices::getObjId,insuranceApply.getId()));
- 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);
+
+ 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);
}
-
-
-// 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);
-// }
--
Gitblit v1.9.3