From 568e38a95cb6fb20fe16b53d17f610aefc6f744f Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 09 十月 2025 18:29:29 +0800
Subject: [PATCH] 钉钉通知 与钥匙柜开发
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 568 +++++++++++++++++++++++++++++++++++++++++++++-----------
1 files changed, 453 insertions(+), 115 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 7d1f53c..fe94066 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
@@ -3,26 +3,34 @@
import com.alibaba.fastjson.JSONObject;
import com.doumee.biz.system.SystemDictDataBiz;
import com.doumee.core.constants.ResponseStatus;
+import com.doumee.core.dingTalk.DingTalk;
import com.doumee.core.exception.BusinessException;
import com.doumee.core.haikang.model.HKConstants;
import com.doumee.core.haikang.model.param.BaseResponse;
import com.doumee.core.haikang.model.param.request.ParkReservationAddRequest;
import com.doumee.core.haikang.model.param.respose.ParkReservationAddResponse;
import com.doumee.core.haikang.service.HKService;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.core.utils.DateUtil;
import com.doumee.core.utils.SmsConstants;
import com.doumee.core.utils.Utils;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
+import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.business.*;
import com.doumee.dao.business.dao.CompanyMapper;
+import com.doumee.dao.business.dao.MemberMapper;
+import com.doumee.dao.business.dao.SmsConfigMapper;
+import com.doumee.dao.business.dao.SmsEmailMapper;
import com.doumee.dao.business.dto.ApproveDTO;
import com.doumee.dao.business.join.ApproveJoinMapper;
import com.doumee.dao.business.join.CarUseBookJoinMapper;
import com.doumee.dao.business.join.VisitsJoinMapper;
import com.doumee.dao.business.model.*;
import com.doumee.dao.business.vo.ApproveDataVO;
+import com.doumee.dao.business.model.Member;
+import com.doumee.dao.system.SystemUserMapper;
import com.doumee.dao.system.dto.NoticesDTO;
import com.doumee.dao.system.join.NoticesJoinMapper;
import com.doumee.dao.system.model.Notices;
@@ -40,7 +48,6 @@
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Lazy;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -64,6 +71,8 @@
@Autowired
private SystemDictDataBiz systemDictDataBiz;
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
@Autowired
private ApproveTemplMapper approveTemplMapper;
@@ -79,15 +88,16 @@
@Autowired
private CarUseBookMapper carUseBookMapper;
+
+ @Autowired
+ private SystemUserMapper systemUserMapper;
@Autowired
private CarDriverMapper carDriverMapper;
- @Autowired
- private VisitsMapper visitsMapper;
@Autowired
- private VisitsJoinMapper visitsJoinMapper;
+ private VisitsJoinMapper visitsMapper;
@Autowired
private CarUseBookJoinMapper carUseBookJoinMapper;
@@ -103,44 +113,34 @@
private PlatformReasonMapper platformReasonMapper;
@Autowired
private PlatformGroupMapper platformGroupMapper;
-
-
@Autowired
private ParksMapper parksMapper;
-
@Autowired
private ParkBookMapper parkBookMapper;
-
@Autowired
private VisitParkMapper visitParkMapper;
-
@Autowired
private SmsConfigMapper smsConfigMapper;
-
@Autowired
private SmsEmailMapper smsEmailMapper;
-
@Autowired
private EmayService emayService;
-
-
+ @Autowired
+ private DingTalk dingTalk;
@Override
public Integer create(Approve approve) {
approveMapper.insert(approve);
return approve.getId();
}
-
@Override
public void deleteById(Integer id) {
approveMapper.deleteById(id);
}
-
@Override
public void delete(Approve approve) {
UpdateWrapper<Approve> deleteWrapper = new UpdateWrapper<>(approve);
approveMapper.delete(deleteWrapper);
}
-
@Override
public void deleteByIdInBatch(List<Integer> ids) {
if (CollectionUtils.isEmpty(ids)) {
@@ -285,14 +285,17 @@
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)
+ &&StringUtils.equals(i.getParam2(),"0")
).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)
@@ -306,6 +309,7 @@
internalHomeVO.setNoticeCopyNum(
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ONE)
+ &&Constants.equalsInteger(i.getReaded(),Constants.ZERO)
).count()
);
}
@@ -335,6 +339,7 @@
noticesList.stream().filter(i->Constants.equalsInteger(i.getUserId(),noticesDTO.getMemberId())
&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ &&StringUtils.equals(i.getParam2(),"0")
).count()
);
internalHomeVO.setNoticeDealNum(
@@ -364,10 +369,11 @@
* @param tempType 妯℃澘绫诲瀷 0闈炴柦宸ヤ汉鍛樿瀹㈢敵璇� 1鏂藉伐浜哄憳璁垮鐢宠 2璁垮鎶ュ 3鍏溅甯傚唴鐢ㄨ溅 4鍏溅瀹ゅ鐢ㄨ溅 5甯傚叕鍙哥墿娴佽溅棰勭害
* @param businessId 涓氬姟涓婚敭 鏍规嵁 tempType
* @param createMemberId 鎻愪氦娴佺▼浜哄憳
+ * @param applyMember 鐢宠浜哄璞★紙濡傛灉涓虹┖锛岄粯璁や负鎻愪氦浜猴級
*/
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId){
+ public void createApproveFlow(Integer tempType,Integer businessId,Integer createMemberId,Member applyMember){
//鏌ヨ澶勭悊妯℃澘
ApproveTempl approveTempl = approveTemplMapper.selectOne(new QueryWrapper<ApproveTempl>().lambda()
.eq(ApproveTempl::getType,tempType)
@@ -394,18 +400,15 @@
}
List<ApproveParam> approveCopyList = approveParamAllList.stream().filter(i->i.getType().equals(Constants.ONE)).collect(Collectors.toList());
- Member createMember = memberMapper.selectById(createMemberId);
+ Member createMember = memberMapper.selectById(createMemberId);
if(Objects.isNull(createMember)|| Objects.isNull(createMember.getCompanyId())){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鐢宠浜虹粍缁囦俊鎭紓甯�");
}
List<Approve> approveList = new ArrayList<>();
-
- this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
-
+ this.organizeApproveData(approveTempl,approveParamList,createMember,applyMember,businessId,approveList);
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
}
-
//澶勭悊鎶勯�佹暟鎹�
if(CollectionUtils.isNotEmpty(approveCopyList)){
this.organizeApproveCopyData(approveTempl,approveCopyList,businessId,approveList);
@@ -417,7 +420,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
- public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId){
+ public void createApproveForPlatfrom(Integer tempId,Integer businessId,Integer createMemberId ){
//鏌ヨ澶勭悊妯℃澘
ApproveTempl approveTempl = approveTemplMapper.selectById(tempId);
if(Objects.isNull(approveTempl)){
@@ -446,7 +449,7 @@
}
List<Approve> approveList = new ArrayList<>();
- this.organizeApproveData(approveTempl,approveParamList,createMember,businessId,approveList);
+ this.organizeApproveData(approveTempl,approveParamList,createMember,null,businessId,approveList);
if(CollectionUtils.isEmpty(approveList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃敊璇�");
@@ -468,15 +471,18 @@
* @param businessId
* @param approveList
*/
- public void organizeApproveData(ApproveTempl approveTempl,List<ApproveParam> approveParamList,Member createMember,Integer businessId,List<Approve> approveList){
+ public void organizeApproveData(ApproveTempl approveTempl,List<ApproveParam> approveParamList,Member createMember,Member applyMember,Integer businessId,List<Approve> approveList){
+ if(applyMember ==null){
+ applyMember = createMember;
+ }
//鍒涘缓榛樿浜轰俊鎭�
Approve createUserApprove = new Approve();
createUserApprove.setRemark("鍙戣捣鐢宠");
createUserApprove.setCreateDate(new Date());
createUserApprove.setIsdeleted(Constants.ZERO);
createUserApprove.setTemplatId(approveTempl.getId());
- createUserApprove.setChekorId(createMember.getId());
+ createUserApprove.setChekorId(applyMember.getId());
createUserApprove.setCheckDate(createUserApprove.getCreateDate());
createUserApprove.setStatus(Constants.approveStatus.pass);
createUserApprove.setTitle("鍙戣捣鐢宠");
@@ -492,12 +498,18 @@
approveList.add(createUserApprove);
//鏌ヨ鎵�鏈夊緟澶勭悊浜�
-
+// String token = systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode();
//瀹℃壒涓氬姟鏁版嵁
for (int i = 0; i < approveParamList.size(); i++) {
ApproveParam approveParam = approveParamList.get(i);
List<Integer> ids = this.getApproveUserIds(approveParam,createMember);
- List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda().in(Member::getId,ids));
+ List<Member> memberList = memberMapper.selectJoinList(Member.class,
+ new MPJLambdaWrapper<Member>()
+ .selectAll(Member.class)
+ .selectAs(SystemUser::getOpenid,Member::getSystemOpenid)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
+ .in(Member::getId,ids)
+ );
List<String> memberNameList =memberList.stream().map(m->m.getName()).collect(Collectors.toList());
String memberNames = String.join(",",memberNameList);
Integer noticeType = Constants.approveTypeToNoticeType(approveTempl.getType());
@@ -512,22 +524,25 @@
title = this.createNoticesData(noticeType,businessId,title,jsonMap);
}
if(j==0){
- //榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢�
- Notices notices = new Notices();
- notices.setCreateDate(new Date());
- notices.setIsdeleted(Constants.ONE);
- notices.setObjId(businessId);
- notices.setObjType(noticeType);
- notices.setType(noticeType);
- notices.setTitle(title);
- notices.setParam1(JSONObject.toJSONString(jsonMap));
- notices.setStatus(Constants.ZERO);
- notices.setReaded(Constants.ZERO);
- notices.setSendacopy(Constants.ZERO);
- notices.setParam2("0");
- notices.setParam3(createMember.getId().toString());
- notices.setInfo("澶勭悊涓�");
- noticesJoinMapper.insert(notices);
+ //璁垮浜哄憳涓嶇敓鎴愭璁板綍
+ if(!(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)&&Constants.equalsInteger(applyMember.getType(),Constants.ONE))){
+ //榛樿鐢熸垚涓�鏉� 鐢宠浜虹殑鏁版嵁 鏍囪鍒犻櫎鐘舵�佺敤浜庡鐞嗗埌 浠诲姟涓績锛堟垜鍙戣捣锛変娇鐢�
+ Notices notices = new Notices();
+ notices.setCreateDate(new Date());
+ notices.setIsdeleted(Constants.ONE);
+ notices.setObjId(businessId);
+ notices.setObjType(noticeType);
+ notices.setType(noticeType);
+ notices.setTitle(title);
+ notices.setParam1(JSONObject.toJSONString(jsonMap));
+ notices.setStatus(Constants.ZERO);
+ notices.setReaded(Constants.ZERO);
+ notices.setSendacopy(Constants.ZERO);
+ notices.setParam2("0");
+ notices.setParam3(createMember.getId().toString());
+ notices.setInfo("澶勭悊涓�");
+ noticesJoinMapper.insert(notices);
+ }
}
if(CollectionUtils.isEmpty(memberList)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌瀹℃壒浜轰俊鎭�");
@@ -563,7 +578,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);
@@ -575,6 +590,7 @@
approve.setType(Constants.ZERO);
approveList.add(approve);
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Constants.equalsInteger(approve.getStatus(),Constants.ONE) && StringUtils.isNotBlank(member.getPhone())){
//鍙戦�佺煭淇￠�氱煡
if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.reason)){
@@ -584,13 +600,31 @@
SmsConstants.platformBookContent.platformBookWaitAudit,
null,Arrays.asList(member.getPhone().split(","))
);
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ platformBooksMapper.selectById(businessId),
+ WxPlatConstants.platformBookContent.platformBookWaitAudit,
+ Arrays.asList(member.getSystemOpenid().split(",")),
+ Constants.ONE);
+ }
}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(","))
);
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitContent.visitWaitAudit,
+ Arrays.asList(member.getSystemOpenid().split(","))
+ );
+ }
+
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
//璁垮鎶ュ
SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
@@ -598,6 +632,13 @@
SmsConstants.visitReportingContent.visitReportingNotice,
null,Arrays.asList(member.getPhone().split(","))
);
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visitsMapper.selectById(businessId), WxPlatConstants.visitReportContent.visitReportWaitAudit,
+ Arrays.asList(member.getSystemOpenid().split(","))
+ );
+ }
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.useCar)){
//鐢ㄨ溅鐢宠
SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
@@ -605,10 +646,61 @@
SmsConstants.carUseBookContent.carUseBookWaitAudit,
null,Arrays.asList(member.getPhone().split(","))
);
+ //鍏紬鍙烽�氱煡
+ if(StringUtils.isNotBlank(member.getSystemOpenid())){
+ CarUseBook carUseBook = carUseBookMapper.selectById(businessId);
+ if(Objects.nonNull(carUseBook)){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser)){
+ carUseBook.setMemberName(systemUser.getRealname());
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ carUseBookMapper.selectById(businessId),
+ WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
+ Arrays.asList(member.getSystemOpenid().split(",")),
+ Constants.ONE);
+ }
+ }
+ }
+ }
+ }
+ }
+ if(Constants.equalsInteger(i,Constants.ZERO) && CollectionUtils.isNotEmpty(memberList)){
+ //鐢熸垚绗竴鎵归拤閽夊鎵归�氱煡淇℃伅
+ List<String> erpId = memberList.stream().filter(m->StringUtils.isNotBlank(m.getErpId())).map(m->m.getErpId()).collect(Collectors.toList());
+ if(CollectionUtils.isNotEmpty(erpId)){
+ if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.useCar)){
+ CarUseBook carUseBook = carUseBookMapper.selectJoinOne(CarUseBook.class,
+ new MPJLambdaWrapper<CarUseBook>()
+ .selectAll(CarUseBook.class)
+ .selectAs(Member::getName,CarUseBook::getMemberName)
+ .leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ .eq(CarUseBook::getId,businessId)
+ .last(" limit 1 ")
+ );
+ if(Objects.nonNull(carUseBook)){
+ if(CollectionUtils.isNotEmpty(erpId)){
+ String ddTalkId = dingTalk.toDoNotice(StringUtils.isNotBlank(carUseBook.getMemberName())?(carUseBook.getMemberName()+"鎻愪氦鐨勫叕鍔＄敤杞︾敵璇�"):"鍏姟杞︾敤杞︾敵璇�",
+ erpId ,
+ dingTalk.getToDoCarUseBookFiledInfo(carUseBook),"pages/staff/vehicle/sendACarDetail?id="+carUseBook.getId());
+ carUseBookMapper.update(new UpdateWrapper<CarUseBook>().lambda()
+ .set(CarUseBook::getDdBelongToUnionId,erpId.get(Constants.ZERO))
+ .set(CarUseBook::getDdToDoId,ddTalkId).eq(CarUseBook::getId,carUseBook.getId()));
+ }
+ }
+ }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit) || Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)) {
+ Visits visits = visitsMapper.selectById(businessId);
+ if (Objects.nonNull(visits)) {
+ //TODO 缂哄皯鍩熷悕鍓嶇紑鍐呭
+ String ddTalkId = dingTalk.toDoNotice(visits.getName() + "鐨勮瀹㈢敵璇�",
+ erpId,
+ dingTalk.getToDoVisitFiledInfo(visits), "pages/appointmentDetails/appointmentDetails?id=" + visits.getId());
+ visitsMapper.update(new UpdateWrapper<Visits>().lambda()
+ .set(Visits::getDdBelongToUnionId,erpId.get(Constants.ZERO))
+ .set(Visits::getDdToDoId, ddTalkId).eq(Visits::getId, visits.getId()));
+ }
}
}
-
-
}
}
}
@@ -620,7 +712,7 @@
if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visit)
|| Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
//璁垮璁板綍涓庤瀹㈡姤澶�
- Visits visits = visitsJoinMapper.selectJoinOne(Visits.class,
+ Visits visits = visitsMapper.selectJoinOne(Visits.class,
new MPJLambdaWrapper<Visits>().selectAll(Visits.class)
.selectAs(Member::getName,Visits::getReceptMemberName)
.selectAs(Company::getName,Visits::getReceptMemberDepartment)
@@ -668,13 +760,23 @@
if(Objects.isNull(platformBooks)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌涓氬姟鏁版嵁淇℃伅");
}
- title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName();
- jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
- jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
- jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
- jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront());
+ title = ApproveServiceImpl.creatPlatformBookNotice(platformBooks,jsonMap);
+// title = "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName();
+// jsonMap.put("inType", "鍏ュ簱绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
+// jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
+// jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
+// jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront());
}
return title;
+ }
+
+ public static String creatPlatformBookNotice(PlatformBooks platformBooks,Map<String,Object> jsonMap){
+ jsonMap.put("inType", "浣滀笟绫诲瀷锛�"+(Constants.equalsInteger(platformBooks.getInType(),Constants.ZERO)?"鏁存墭鐩�":"浠剁儫"));
+ jsonMap.put("totalNum", "鎬昏繍杈撻噺锛�"+platformBooks.getTotalNum()+"涓囨敮");
+ jsonMap.put("arriveDate", "鍒板満鏃堕棿锛�" + DateUtil.DateToStr(platformBooks.getArriveDate() , "yyyy-MM-dd HH:mm"));
+ jsonMap.put("carNum", "杞︾墝鐓э細"+platformBooks.getCarCodeFront());
+ return "[鐗╂祦杞﹀叆鍥绾鐢宠浜�-" + platformBooks.getDriverName() ;
+
}
@@ -788,6 +890,9 @@
* @param objLevel 鏌ヨ绾у埆
*/
public Company getAuditCompanyHead(Integer companyId, Integer objLevel){
+ if(Objects.isNull(objLevel)||Objects.isNull(companyId)){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"瀹℃壒娴侀厤缃紓甯革紝璇疯仈绯荤鐞嗗憳");
+ }
Company auditCompany = companyMapper.selectById(companyId);
Integer queryLevel = Constants.ONE;
while(queryLevel<objLevel){
@@ -921,7 +1026,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(),"瀹℃壒浜�"):"鎶勯�佹垨绛惧鎵逛汉");
}
@@ -1145,6 +1249,7 @@
@Override
@Transactional(rollbackFor = {Exception.class,BusinessException.class})
public void approved(ApproveDTO approveDTO){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
if(Objects.isNull(approveDTO)
|| Objects.isNull(approveDTO.getObjId())
|| Objects.isNull(approveDTO.getObjType())
@@ -1152,8 +1257,10 @@
|| Objects.isNull(approveDTO.getLoginUserInfo())){
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
- if(approveDTO.getStatus().equals(Constants.THREE)&&StringUtils.isBlank(approveDTO.getCheckInfo())){
- throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ嫆缁濊鏄�");
+ if(!(Constants.equalsInteger(approveDTO.getObjType(),Constants.THREE)||Constants.equalsInteger(approveDTO.getObjType(),Constants.FOUR))){
+ if(approveDTO.getStatus().equals(Constants.THREE)&&StringUtils.isBlank(approveDTO.getCheckInfo())){
+ throw new BusinessException(ResponseStatus.BAD_REQUEST.getCode(),"璇疯緭鍏ユ嫆缁濊鏄�");
+ }
}
Approve approve = approveMapper.selectOne(new QueryWrapper<Approve>()
.lambda()
@@ -1217,6 +1324,7 @@
approveMapper.updateById(approve);
//鏄惁澶勭悊 涓氬姟鏁版嵁
Boolean dealBusinessBean = false;
+ Boolean dealDDToDo = false;
//瀹℃壒椹冲洖鎯呭喌
if(approveDTO.getStatus().equals(Constants.THREE)){
dealBusinessBean = true;
@@ -1250,7 +1358,7 @@
.set(Notices::getInfo,"宸叉嫆缁�")
.eq(Notices::getObjId,notices.getObjId())
.eq(Notices::getObjType,notices.getObjType())
- .eq(Notices::getReaded,Constants.ZERO)
+// .eq(Notices::getReaded,Constants.ZERO)
.ne(Notices::getId,notices.getId())
);
}
@@ -1279,12 +1387,13 @@
.in(Approve::getId,approveList.stream().map(m->m.getId()).collect(Collectors.toList())));
}
/**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
-
List<Approve> waitAuditList = approveJoinMapper.selectJoinList(Approve.class,
new MPJLambdaWrapper<Approve>()
.selectAll(Approve.class)
.selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(SystemUser::getOpenid,Approve::getSystemOpenid)
.leftJoin(Member.class,Member::getId,Approve::getChekorId)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
.eq(Approve::getStatus,Constants.approveStatus.wait)
.eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
@@ -1300,49 +1409,43 @@
.eq(Approve::getObjType,approve.getObjType())
.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(),
- SmsConstants.platformBookContent.platformBookWaitAudit,
- approveDTO.getCheckInfo(),memberPhone
- );
- }
+ List<String> openIdList =waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getSystemOpenid())).map(i->i.getSystemOpenid()).collect(Collectors.toList());
- 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);
- }
+ this.sendNextLvSms(approve,approveDTO,memberPhone,openIdList);
- //璁垮鐢宠/鎶ュ
- if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
- ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
- ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
- Visits visits = visitsMapper.selectById(approve.getObjId());
- if(Objects.nonNull(visits)){
- if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
- visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
- }
- }
- }
-
- if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
- Constants.approveObjectType.unCityUseCar)){
- this.updDriver(approveDTO,approve,false);
- }
+// if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+// Constants.approveObjectType.unCityUseCar)){
+// this.updDriver(approveDTO,approve,false);
+// }
}else if(approve.getApproveType().equals(Constants.ONE)){
//浼氱 涓旂粓瀹�
+ if(!Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
+ //鏍囪閽夐拤閫氱煡鑷繁宸插鐞�
+ dealDDToDo = true;
+ }
+
//鏃犱粬浜哄鎵圭殑鎯呭喌 鍒欎慨鏀规暟鎹姸鎬�
if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ONE)){
dealBusinessBean = true;
}else{
if(Constants.equalsInteger(approveList.size(),Constants.ZERO)&&Constants.equalsInteger(approve.getIsEndCheck(),Constants.ZERO)){
/**寮�鍚笅涓�绾у埆鐨勬暟鎹负寰呭鏍�**/
+ List<Approve> waitAuditList = approveJoinMapper.selectJoinList(Approve.class,
+ new MPJLambdaWrapper<Approve>()
+ .selectAll(Approve.class)
+ .selectAs(Member::getPhone,Approve::getMemberPhone)
+ .selectAs(SystemUser::getOpenid,Approve::getSystemOpenid)
+ .leftJoin(Member.class,Member::getId,Approve::getChekorId)
+ .leftJoin(SystemUser.class,SystemUser::getMemberId,Member::getId)
+ .eq(Approve::getStatus,Constants.approveStatus.wait)
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getLevel,(approve.getLevel()+1)));
+
+
approveJoinMapper.update(null,new UpdateWrapper<Approve>()
.lambda()
.set(Approve::getStatus,Constants.approveStatus.auditIng)
@@ -1353,14 +1456,23 @@
.eq(Approve::getObjType,approve.getObjType())
.eq(Approve::getLevel,(approve.getLevel()+1))
);
+
+
+ //鍙戦�佺煭淇￠�氱煡 涓嬬骇瀹℃壒浜�
+ List<String> memberPhone = waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getMemberPhone())).map(i->i.getMemberPhone()).collect(Collectors.toList());
+ List<String> openIdList =waitAuditList.stream().filter(i->StringUtils.isNotBlank(i.getSystemOpenid())).map(i->i.getSystemOpenid()).collect(Collectors.toList());
+
+
+ this.sendNextLvSms(approve,approveDTO,memberPhone,openIdList);
+
}
- if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
- Constants.approveObjectType.unCityUseCar)){
- this.updDriver(approveDTO,approve,false);
- }
+// if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+// Constants.approveObjectType.unCityUseCar)){
+// this.updDriver(approveDTO,approve,false);
+// }
}
}
- this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
+ this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO,dealDDToDo);
}
//澶勭悊涓氬姟鏁版嵁
if(dealBusinessBean){
@@ -1368,20 +1480,129 @@
}
}
+
+
+
+ public void sendNextLvSms(Approve approve ,ApproveDTO approveDTO , List<String> memberPhone ,List<String> openIdList){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ //鐗╂祦杞﹂绾�
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .in(Member::getPhone,memberPhone)
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
+ .isNotNull(Member::getErpId)
+ );
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
+ SmsEmailServiceImpl.sendPlatformBookSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,platformBooksMapper,approveDTO.getObjId(),
+ SmsConstants.platformBookContent.platformBookWaitAudit,
+ approveDTO.getCheckInfo(),memberPhone
+ );
+ //鍏紬鍙烽�氱煡
+ if(CollectionUtils.isNotEmpty(openIdList)){
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,
+ platformBooksMapper.selectById(approveDTO.getObjId()),
+ WxPlatConstants.platformBookContent.platformBookWaitAudit,
+ openIdList,
+ Constants.ONE);
+ }
+
+ } else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)
+ || approveDTO.getObjType().equals(Constants.approveObjectType.unCityUseCar)){
+
+ this.updDriver(approveDTO,approve,false);
+
+ SmsEmailServiceImpl.sendCarUseSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,carUseBookMapper,approveDTO.getObjId(),
+ SmsConstants.carUseBookContent.carUseBookWaitAudit,
+ approveDTO.getCheckInfo(),memberPhone);
+ //鍙戦�佸叕浼楀彿閫氱煡
+ CarUseBook carUseBook = carUseBookMapper.selectJoinOne(CarUseBook.class,
+ new MPJLambdaWrapper<CarUseBook>()
+ .selectAll(CarUseBook.class)
+ .selectAs(Member::getName,CarUseBook::getMemberName)
+ .leftJoin(Member.class,Member::getId,CarUseBook::getMemberId)
+ .eq(CarUseBook::getId,approve.getObjId())
+ .last(" limit 1 ")
+ );
+ if(CollectionUtils.isNotEmpty(openIdList)&&Objects.nonNull(carUseBook)){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ if(Objects.nonNull(systemUser)){
+ carUseBook.setMemberName(systemUser.getRealname());
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,carUseBook,
+ WxPlatConstants.carUseBookContent.carUseBookWaitAudit,
+ openIdList,1);
+ }
+ }
+ //鍙戦�侀拤閽夊緟鍔� 鍏姟杞︾敵璇�
+ if(Objects.nonNull(carUseBook)&&Objects.nonNull(memberList)){
+ //鏍囪褰撳墠瀹℃壒浜哄凡瀹屾垚
+ dingTalk.updToDoNoticeInfoStatus(carUseBook.getDdBelongToUnionId(),carUseBook.getDdToDoId());
+ //TODO 缂哄皯鍩熷悕鍓嶇紑鍐呭
+ String ddTalkId = dingTalk.toDoNotice(StringUtils.isNotBlank(carUseBook.getMemberName())?(carUseBook.getMemberName()+"鎻愪氦鐨勫叕鍔＄敤杞︾敵璇�"):"鍏姟杞︾敤杞︾敵璇�",
+ memberList.stream().map(i->i.getErpId()).collect(Collectors.toList()) ,
+ dingTalk.getToDoCarUseBookFiledInfo(carUseBook),"pages/staff/vehicle/sendACarDetail?id="+carUseBook.getId());
+ carUseBookMapper.update(new UpdateWrapper<CarUseBook>().lambda()
+ .set(CarUseBook::getDdToDoId,ddTalkId).eq(CarUseBook::getId,carUseBook.getId()));
+ }
+ }else
+ //璁垮鐢宠/鎶ュ
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
+ Visits visits = visitsMapper.selectById(approve.getObjId());
+ if(Objects.nonNull(visits)){
+ if(Constants.equalsInteger(visits.getStatus(),Constants.ZERO)){
+ visitsMapper.update(null,new UpdateWrapper<Visits>().lambda().set(Visits::getStatus,Constants.ONE).eq(Visits::getId,visits.getId()));
+ }
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,approveDTO.getObjId(),
+ approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)?
+ SmsConstants.visitReportingContent.visitReportingNotice:SmsConstants.visitContent.visitNotice,
+ null,memberPhone
+ );
+ //鍏紬鍙烽�氱煡
+ if(CollectionUtils.isNotEmpty(openIdList)){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visitsMapper.selectById(approveDTO.getObjId()),
+ approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)?WxPlatConstants.visitReportContent.visitReportWaitAudit:WxPlatConstants.visitContent.visitWaitAudit,
+ openIdList
+ );
+ }
+ if(Objects.nonNull(visits)&&Objects.nonNull(memberList)){
+ //鏍囪褰撳墠瀹℃壒浜哄凡瀹屾垚
+ dingTalk.updToDoNoticeInfoStatus(visits.getDdBelongToUnionId(),visits.getDdToDoId());
+ //TODO 缂哄皯鍩熷悕鍓嶇紑鍐呭
+ String ddTalkId = dingTalk.toDoNotice(visits.getName()+"鐨勮瀹㈢敵璇�",
+ memberList.stream().map(i->i.getErpId()).collect(Collectors.toList()) ,
+ dingTalk.getToDoVisitFiledInfo(visits),"pages/appointmentDetails/appointmentDetails?id="+visits.getId());
+ visitsMapper.update(new UpdateWrapper<Visits>().lambda()
+ .set(Visits::getDdToDoId,ddTalkId).eq(Visits::getId,visits.getId()));
+ }
+
+ }
+ }
+ }
+
+
+
/**
* 澶勭悊寰呭姙淇℃伅
* @param dealBusinessBean 鏄惁闇�瑕佽繘琛屾洿鏂颁笟鍔℃暟鎹姸鎬�
* @param approve 瀹℃壒璁板綍
* @param approveList 鍚岀骇寰呭鎵规暟鎹�
+ * @param dealDDToDo 鏄惁澶勭悊 褰撳墠瀹℃壒淇℃伅浜虹殑閽夐拤鐨勫伐浣滈�氱煡
+ *
*/
- public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO){
+ public void passNextNotices(Boolean dealBusinessBean,Notices notices,Approve approve,List<Approve> approveList,List<Approve> copyList,ApproveDTO approveDTO,Boolean dealDDToDo){
//鏈紑鍚笅涓�绾ф椂锛屾搷浣滃悗鐨勫緟瀹℃壒浜�
String memberNames =notices.getParam5()
.replaceAll(","+notices.getRemark(),"")
.replaceAll(notices.getRemark()+",","")
.replaceAll(notices.getRemark(),"");
-
-
//1銆佷慨鏀硅嚜宸辩殑鏁版嵁璁板綍
noticesJoinMapper.update(null,new UpdateWrapper<Notices>().lambda()
@@ -1462,6 +1683,30 @@
}
}
}
+ if(dealDDToDo){
+ if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
+ ||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)) {
+ Member member = memberMapper.selectById(approve.getChekorId());
+ // 璁垮 涓夌被涓氬姟鏁版嵁
+ Visits visits = visitsMapper.selectById(approveDTO.getObjId());
+ if(Objects.nonNull(member)&&Objects.nonNull(member.getErpId())
+ &&Objects.nonNull(visits)&&Objects.nonNull(visits.getDdToDoId())&&Objects.nonNull(visits.getDdBelongToUnionId())){
+ dingTalk.updUserToDoNoticeInfoStatus(visits.getDdBelongToUnionId(),visits.getDdToDoId(),member.getErpId());
+ }
+ }else if(approveDTO.getObjType().equals(Constants.approveObjectType.cityUseCar)||approveDTO.getObjType().equals(
+ Constants.approveObjectType.unCityUseCar)){
+ Member member = memberMapper.selectById(approve.getChekorId());
+ CarUseBook carUseBook = carUseBookJoinMapper.selectById(approveDTO.getObjId());
+ if(Objects.nonNull(member)&&Objects.nonNull(member.getErpId())
+ &&Objects.nonNull(carUseBook)&&Objects.nonNull(carUseBook.getDdToDoId())&&Objects.nonNull(carUseBook.getDdBelongToUnionId())){
+ dingTalk.updUserToDoNoticeInfoStatus(carUseBook.getDdBelongToUnionId(),carUseBook.getDdToDoId(),member.getErpId());
+ }
+ }
+
+
+
+ }
}
@@ -1508,11 +1753,14 @@
public void dealBusinessData(ApproveDTO approveDTO,Approve approve){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ Visits visits = new Visits();
+ CarUseBook carUseBook = new CarUseBook();
if(approveDTO.getObjType().equals(Constants.approveObjectType.unConstructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.constructionVisit)
||approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
// 璁垮 涓夌被涓氬姟鏁版嵁
- Visits visits = visitsMapper.selectById(approveDTO.getObjId());
+ visits = visitsMapper.selectById(approveDTO.getObjId());
if(Objects.isNull(visits)){
throw new BusinessException(ResponseStatus.DATA_EMPTY.getCode(),"鏈煡璇㈠埌鐢宠璁板綍");
}
@@ -1577,6 +1825,7 @@
}
}
//璁垮鎶ュ
+ String objCode = "";
if(approveDTO.getObjType().equals(Constants.approveObjectType.visitReporting)){
//鍙戦�佺煭淇￠�氱煡
SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
@@ -1585,6 +1834,9 @@
SmsConstants.visitReportingContent.visitReportingAuditFail,
approveDTO.getCheckInfo(),null
);
+ objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?
+ WxPlatConstants.visitReportContent.visitReportAuditSuccess:WxPlatConstants.visitReportContent.visitReportAuditFail;
+
}else{ //璁垮鐢宠
//鍙戦�佺煭淇￠�氱煡
SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
@@ -1593,23 +1845,77 @@
SmsConstants.visitContent.visitAuditFail,
approveDTO.getCheckInfo(),null
);
+ if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
+ SmsEmailServiceImpl.sendVisitSms(systemDictDataBiz,
+ emayService,smsEmailMapper,smsConfigMapper,visitsMapper,visits.getId(),
+ SmsConstants.visitContent.visitAuditSuccessToVisiter,
+ approveDTO.getCheckInfo(),null
+ );
+ }
+ objCode = Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? WxPlatConstants.visitContent.visitAuditSuccess:
+ WxPlatConstants.visitContent.visitAuditFail;
}
-
visitsMapper.updateById(visits);
+ //鍙戦�佸井淇″叕浼楀彿
+ if(StringUtils.isNotBlank(objCode)){
+ if(Objects.nonNull(visits) && StringUtils.isNotBlank(visits.getOpenid())){
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visits, objCode,
+ Arrays.asList(visits.getOpenid().split(","))
+ );
+ }
+ //閽夐拤閫氱煡 璁垮琚浜烘垨鎶ュ鎻愪氦浜�
+ Member beVisitMember = memberMapper.selectById(Constants.equalsInteger(visits.getType(),Constants.TWO)?visits.getMemberId():visits.getReceptMemberId());
+ if(Objects.nonNull(beVisitMember)&&StringUtils.isNotBlank(beVisitMember.getDdId())){
+ dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ beVisitMember.getDdId(),
+ dingTalk.getVisitNoticeMsg(visits,visits.getName()+"鐨�"+(Constants.equalsInteger(visits.getType(),Constants.TWO)?"璁垮鎶ュ":"璁垮鐢宠")+"锛�"+
+ (Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? "宸插鎵归�氳繃":"宸插鎵归┏鍥�"))
+ );
+ }
+ }
+ if(StringUtils.isNotBlank(visits.getDdBelongToUnionId())
+ && StringUtils.isNotBlank(visits.getDdToDoId())){
+ //鏍囪褰撳墠閽夐拤瀹℃壒宸插畬鎴�
+ dingTalk.updToDoNoticeInfoStatus(visits.getDdBelongToUnionId(),visits.getDdToDoId());
+ }
}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());
+ carUseBook = carUseBookJoinMapper.selectById(approveDTO.getObjId());
if(Objects.nonNull(carUseBook)){
- Member member = memberMapper.selectById(carUseBook.getMemberId());
- if(Objects.nonNull(member)&&StringUtils.isNotBlank(member.getPhone())){
+ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator());
+ //鍙戦�侀�氱煡鐭伅
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getMobile())){
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(","))
+ approveDTO.getCheckInfo(),Arrays.asList(systemUser.getMobile().split(","))
);
}
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ carUseBook.setMemberName(systemUser.getRealname());
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ wxPlatNotice.sendCarUseBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,carUseBook,
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.carUseBookContent.carUseBookAuditSuccess: WxPlatConstants.carUseBookContent.carUseBookAuditFail,
+ Arrays.asList(systemUser.getOpenid().split(",")),0);
+ }
+ }
+ //閽夐拤閫氱煡鍙戣捣浜�
+ Member creatMember = memberMapper.selectById(carUseBook.getMemberId());
+ if(Objects.nonNull(creatMember)&&StringUtils.isNotBlank(creatMember.getDdId())){
+ dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ creatMember.getErpId(),
+ dingTalk.getCarUseNoticeMsg(carUseBook,carUseBook.getMemberName() + "鎻愪氦鐨勫叕鍔＄敤杞︼紝"+
+ (Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? "宸插鎵归�氳繃":"宸插鎵归┏鍥�"))
+ );
+ }
+ if(StringUtils.isNotBlank(carUseBook.getDdBelongToUnionId())
+ && StringUtils.isNotBlank(carUseBook.getDdToDoId())){
+ //鏍囪褰撳墠閽夐拤瀹℃壒宸插畬鎴�
+ dingTalk.updToDoNoticeInfoStatus(carUseBook.getDdBelongToUnionId(),carUseBook.getDdToDoId());
}
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
@@ -1667,19 +1973,51 @@
approveDTO.getCheckInfo(),null
);
- //TODO 鍙戦�佸井淇″叕浼楀彿娑堟伅
+ //鍙戦�佸井淇″叕浼楀彿娑堟伅
+ SystemUser driver = systemUserMapper.selectOne(new QueryWrapper<SystemUser>().lambda()
+ .eq(SystemUser::getDeleted, Constants.ZERO)
+ .eq(SystemUser::getType, Constants.ZERO)
+ .eq(SystemUser::getMobile,platformBooks.getDriverPhone())
+ .last(" limit 1 "));
+ if(Objects.nonNull(driver) && StringUtils.isNotBlank(driver.getOpenid())){
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡
+ wxPlatNotice.sendPlatformBookTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper, platformBooks,
+ Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?WxPlatConstants.platformBookContent.platformBookAuditSuccess: WxPlatConstants.platformBookContent.platformBookAuditFail,
+ Arrays.asList(driver.getOpenid().split(",")),0);
+ }
}else{
throw new BusinessException(ResponseStatus.BAD_REQUEST);
}
if(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)){
- //澶勭悊閫氳繃 鏄剧ず鎵�鏈夌殑鎶勯�佽褰�
- approveMapper.update(null,new UpdateWrapper<Approve>().lambda().set(Approve::getStatus,Constants.TWO)
- .set(Approve::getCheckDate,new Date())
- .eq(Approve::getObjId,approve.getObjId())
+ List<Approve> approveList = approveMapper.selectList(new QueryWrapper<Approve>().lambda().eq(Approve::getObjId,approve.getObjId())
.eq(Approve::getObjType,approve.getObjType())
- .eq(Approve::getType,Constants.ONE)
- );
+ .eq(Approve::getType,Constants.ONE));
+ if(CollectionUtils.isNotEmpty(approveList)){
+ //澶勭悊閫氳繃 鏄剧ず鎵�鏈夌殑鎶勯�佽褰�
+ approveMapper.update(null,new UpdateWrapper<Approve>().lambda().set(Approve::getStatus,Constants.TWO)
+ .set(Approve::getCheckDate,new Date())
+ .eq(Approve::getObjId,approve.getObjId())
+ .eq(Approve::getObjType,approve.getObjType())
+ .eq(Approve::getType,Constants.ONE)
+ );
+ List<Member> memberList = memberMapper.selectList(new QueryWrapper<Member>().lambda()
+ .eq(Member::getIsdeleted,Constants.ZERO)
+ .eq(Member::getStatus,Constants.ZERO)
+ .isNotNull(Member::getDdId)
+ .in(Member::getId,approveList.stream().map(i->i.getChekorId()).collect(Collectors.toList())));
+ if(CollectionUtils.isNotEmpty(memberList)){
+ if(Objects.nonNull(visits)||Objects.nonNull(carUseBook)){
+ dingTalk.workInfoOANotice(Long.valueOf(systemDictDataBiz.queryByCode(Constants.DD_TALK,Constants.AGENT_ID).getCode()),
+ StringUtils.join(memberList.stream().map(i->i.getDdId()).collect(Collectors.toList()),","),
+ Objects.nonNull(visits)?
+ dingTalk.getVisitNoticeMsg(visits,visits.getName()+"鐨�"+(Constants.equalsInteger(visits.getType(),Constants.TWO)?"璁垮鎶ュ":"璁垮鐢宠")+"锛屾妱閫佺粰鎮紝璇风煡鏅�"):
+ dingTalk.getCarUseNoticeMsg(carUseBook,carUseBook.getMemberName() + "鎻愪氦鐨勫叕鍔＄敤杞︼紝鎶勯�佺粰鎮紝璇风煡鏅�")
+ );
+ }
+ }
+ }
}
}
@@ -1703,7 +2041,7 @@
if(approveDTO.getStatus()==Constants.TWO&&Constants.equalsInteger(approve.getDriverParam(),Constants.ONE)){
CarDriver carDriver = carDriverMapper.selectOne(new QueryWrapper<CarDriver>().lambda()
.eq(CarDriver::getIsdeleted,Constants.ZERO)
- .eq(CarDriver::getStatus,Constants.ZERO)
+// .eq(CarDriver::getStatus,Constants.ZERO)
.eq(CarDriver::getMemberId,approveDTO.getDriverId()));
if(Objects.isNull(carDriver)){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"鏈煡璇㈠埌鍙告満淇℃伅");
--
Gitblit v1.9.3