From 168c5450e3493852059da54d698d08c2269b91fc Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 22 十月 2024 17:51:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 84 ++++++++++++++++++++++++++++++++++++-----
1 files changed, 73 insertions(+), 11 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
index 5417979..7f493e7 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java
@@ -285,14 +285,16 @@
if(CollectionUtils.isNotEmpty(noticesList)){
//寰呮垜澶勭悊鐨勬暟鎹�
internalHomeVO.setNoticeWaitNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ noticesList.stream().filter(i->
+ Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
).count()
);
//宸插鐞嗘暟鎹�
internalHomeVO.setNoticeDealNum(
- noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
+ noticesList.stream().filter(i->
+ Constants.equalsInteger(i.getUserId(),memberId)
&&StringUtils.equals(i.getParam4(),i.getUserId().toString())
&&Constants.equalsInteger(i.getStatus(),Constants.ONE)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
@@ -303,9 +305,10 @@
noticesJoinMapper.selectCount(new QueryWrapper<Notices>().lambda().eq(Notices::getParam3,memberId))
);
//鎶勯�佹垜鐨勬暟鎹�
- internalHomeVO.setNoticeCopyNum(
+ internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
@@ -563,7 +566,7 @@
approve.setTemplatId(approveTempl.getId());
approve.setChekorId(memberId);
approve.setStatus(i==0?Constants.ONE:Constants.ZERO);
- approve.setStatusInfo(i==0?"瀹℃壒涓�":"澶勭悊涓�");
+ approve.setStatusInfo(i==0?"瀹℃壒涓�":"寰呭鐞�");
approve.setTitle(StringUtils.isBlank(approveParam.getRemark())?"瀹℃壒涓�":approveParam.getRemark());
approve.setIsEndCheck((i+1) == approveParamList.size()?Constants.ONE:Constants.ZERO);
approve.setObjId(businessId);
@@ -584,8 +587,30 @@
SmsConstants.platformBookContent.platformBookWaitAudit,
null,Arrays.asList(member.getPhone().split(","))
);
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)){
+ //璁垮鐢宠
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,businessId,
+ SmsConstants.visitContent.visitNotice,
+ null,Arrays.asList(member.getPhone().split(","))
+ );
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
+ //璁垮鎶ュ
+ SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,businessId,
+ SmsConstants.visitReportingContent.visitReportingNotice,
+ null,Arrays.asList(member.getPhone().split(","))
+ );
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.useCar)){
+ //鐢ㄨ溅鐢宠
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,businessId,
+ SmsConstants.carUseBookContent.carUseBookWaitAudit,
+ null,Arrays.asList(member.getPhone().split(","))
+ );
}
}
+
}
}
@@ -899,7 +924,6 @@
}else{
waitModel.setStatus(level.getStatus());
waitModel.setType(Constants.ZERO);
- //waitModel.setStatusInfo(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
waitModel.setTitle(passList.size()<=0?StringUtils.defaultString(level.getTitle(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
}
@@ -1143,7 +1167,7 @@
.last(" limit 1")
);
if(Objects.isNull(approve)){
- throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌瀹℃壒鏁版嵁");
+ throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠宸茶浠栦汉瀹℃壒");
}
if(!approve.getStatus().equals(Constants.ONE)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒璁板綍鐘舵�侀敊璇�!");
@@ -1279,9 +1303,8 @@
.eq(Approve::getLevel,(approve.getLevel()+1))
);
//鍙戦�佺煭淇￠�氱煡 涓嬬骇瀹℃壒浜�
-
-
List<String> memberPhone = waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getMemberPhone())).map(i->i.getMemberPhone()).collect(Collectors.toList());
+ //鐗╂祦杞﹂绾�
if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,approveDTO.getObjId(),
@@ -1290,9 +1313,15 @@
);
}
+ else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)
+ || approveDTO.getObjType().equals(Constants.approveObjectType.unCityUseCar)){
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,approveDTO.getObjId(),
+ SmsConstants.hiddenDangerContent.hiddenDangerDealUser,
+ approveDTO.getCheckInfo(),memberPhone);
+ }
-
-
+ //璁垮鐢宠/鎶ュ
if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
@@ -1302,7 +1331,9 @@
visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
}
}
- }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ }
+
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
this.updDriver(approveDTO,approve,false);
}
@@ -1547,11 +1578,42 @@
visits.setStatus(Constants.VisitStatus.xfFail);
}
}
+ //璁垮鎶ュ
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.visitReportingContent.visitReportingAuditSuccess:
+ SmsConstants.visitReportingContent.visitReportingAuditFail,
+ approveDTO.getCheckInfo(),null
+ );
+ }else{ //璁垮鐢宠
+ //鍙戦�佺煭淇￠�氱煡
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.visitContent.visitAuditSuccess:
+ SmsConstants.visitContent.visitAuditFail,
+ approveDTO.getCheckInfo(),null
+ );
+ }
visitsMapper.updateById(visits);
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
Constants.approveObjectType.unCityUseCar)){
this.updDriver(approveDTO,approve,true);
+ CarUseBook carUseBook = carUseBookJoinMapper.selectById(approveDTO.getObjId());
+ if(Objects.nonNull(carUseBook)){
+ Member member = memberMapper.selectById(carUseBook.getMemberId());
+ if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,approveDTO.getObjId(),
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?SmsConstants.carUseBookContent.carUseBookAuditSuccess:
+ SmsConstants.carUseBookContent.carUseBookAuditFail,
+ approveDTO.getCheckInfo(),Arrays.asList(member.getPhone().split(","))
+ );
+ }
+ }
+
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
//鐗╂祦杞﹂绾�
PlatformBooks platformBooks = platformBooksMapper.selectById(approveDTO.getObjId());
--
Gitblit v1.9.3