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 | 193 ++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 171 insertions(+), 22 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 b352a5e..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,6 +3,7 @@ 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; @@ -124,6 +125,8 @@ private SmsEmailMapper smsEmailMapper; @Autowired private EmayService emayService; + @Autowired + private DingTalk dingTalk; @Override public Integer create(Approve approve) { approveMapper.insert(approve); @@ -621,6 +624,7 @@ Arrays.asList(member.getSystemOpenid().split(",")) ); } + }else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){ //璁垮鎶ュ SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz, @@ -659,9 +663,44 @@ } } } + } + } + 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())); + } + } } - - } } } @@ -1285,6 +1324,7 @@ approveMapper.updateById(approve); //鏄惁澶勭悊 涓氬姟鏁版嵁 Boolean dealBusinessBean = false; + Boolean dealDDToDo = false; //瀹℃壒椹冲洖鎯呭喌 if(approveDTO.getStatus().equals(Constants.THREE)){ dealBusinessBean = true; @@ -1347,7 +1387,6 @@ .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) @@ -1383,13 +1422,17 @@ // } }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) @@ -1419,6 +1462,7 @@ 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); } @@ -1428,7 +1472,7 @@ // } } } - this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO); + this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO,dealDDToDo); } //澶勭悊涓氬姟鏁版嵁 if(dealBusinessBean){ @@ -1442,6 +1486,12 @@ 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(), @@ -1468,9 +1518,15 @@ SmsConstants.carUseBookContent.carUseBookWaitAudit, approveDTO.getCheckInfo(),memberPhone); //鍙戦�佸叕浼楀彿閫氱煡 - if(CollectionUtils.isNotEmpty(openIdList)){ - CarUseBook carUseBook = carUseBookMapper.selectById(approve.getObjId()); - if(Objects.nonNull(carUseBook)){ + 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()); @@ -1479,9 +1535,19 @@ 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) @@ -1506,6 +1572,16 @@ 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())); + } } } @@ -1518,15 +1594,15 @@ * @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() @@ -1607,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()); + } + } + + + + } } @@ -1654,11 +1754,13 @@ 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(),"鏈煡璇㈠埌鐢宠璁板綍"); } @@ -1762,12 +1864,25 @@ 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)){ SystemUser systemUser = systemUserMapper.selectById(carUseBook.getCreator()); //鍙戦�侀�氱煡鐭伅 @@ -1787,6 +1902,20 @@ 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)){ @@ -1862,13 +1991,33 @@ 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() + "鎻愪氦鐨勫叕鍔$敤杞︼紝鎶勯�佺粰鎮紝璇风煡鏅�") + ); + } + } + } } } -- Gitblit v1.9.3