From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/ApproveServiceImpl.java | 239 +++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 212 insertions(+), 27 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 19b3655..5f3fdf0 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;
@@ -94,6 +95,8 @@
@Autowired
private CarDriverMapper carDriverMapper;
+ @Autowired
+ private DdNoticeConfigMapper ddNoticeConfigMapper;
@Autowired
private VisitsJoinMapper visitsMapper;
@@ -124,6 +127,8 @@
private SmsEmailMapper smsEmailMapper;
@Autowired
private EmayService emayService;
+ @Autowired
+ private DingTalk dingTalk;
@Override
public Integer create(Approve approve) {
approveMapper.insert(approve);
@@ -286,6 +291,7 @@
Constants.equalsInteger(i.getUserId(),memberId)
&&Constants.equalsInteger(i.getStatus(),Constants.ZERO)
&&Constants.equalsInteger(i.getSendacopy(),Constants.ZERO)
+ &&StringUtils.equals(i.getParam2(),"0")
).count()
);
//宸插鐞嗘暟鎹�
@@ -335,6 +341,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(
@@ -619,6 +626,7 @@
Arrays.asList(member.getSystemOpenid().split(","))
);
}
+
}else if(Constants.equalsInteger(noticeType,Constants.noticesObjectType.visitReporting)){
//璁垮鎶ュ
SmsEmailServiceImpl.sendVisitReportSms(systemDictDataBiz,
@@ -657,9 +665,51 @@
}
}
}
+ }
+ }
+ 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 ,
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType,9))>Constants.ZERO?
+ dingTalk.getToDoCarUseBookFiledInfo(carUseBook):null,"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() + (Constants.equalsInteger(visits.getType(),Constants.TWO)?"鐨勮瀹㈡姤澶�":"鐨勮瀹㈢敵璇�"),
+ erpId,
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType,Constants.equalsInteger(visits.getType(),Constants.TWO)?5:1))>Constants.ZERO?
+ dingTalk.getToDoVisitFiledInfo(visits):null,
+ "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()));
+ }
+ }
}
-
-
}
}
}
@@ -719,13 +769,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() ;
+
}
@@ -1273,6 +1333,7 @@
approveMapper.updateById(approve);
//鏄惁澶勭悊 涓氬姟鏁版嵁
Boolean dealBusinessBean = false;
+ Boolean dealDDToDo = false;
//瀹℃壒椹冲洖鎯呭喌
if(approveDTO.getStatus().equals(Constants.THREE)){
dealBusinessBean = true;
@@ -1335,7 +1396,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)
@@ -1371,13 +1431,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)
@@ -1407,6 +1471,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);
}
@@ -1416,7 +1481,7 @@
// }
}
}
- this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO);
+ this.passNextNotices(dealBusinessBean,notices,approve,approveList,approveCopyList,approveDTO,dealDDToDo);
}
//澶勭悊涓氬姟鏁版嵁
if(dealBusinessBean){
@@ -1430,6 +1495,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(),
@@ -1456,9 +1527,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());
@@ -1467,9 +1544,22 @@
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()) ,
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType,9))>Constants.ZERO?
+ dingTalk.getToDoCarUseBookFiledInfo(carUseBook):null,"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)
@@ -1494,6 +1584,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()));
+ }
}
}
@@ -1506,15 +1606,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()
@@ -1595,6 +1695,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());
+ }
+ }
+
+
+
+ }
}
@@ -1642,11 +1766,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(),"鏈煡璇㈠埌鐢宠璁板綍");
}
@@ -1750,12 +1876,28 @@
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(),
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType, Constants.equalsInteger(visits.getType(),Constants.TWO)?(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?6:7):(Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?2:3)))>Constants.ZERO?
+ dingTalk.getVisitNoticeMsg(visits,visits.getName()+"鐨�"+(Constants.equalsInteger(visits.getType(),Constants.TWO)?"璁垮鎶ュ":"璁垮鐢宠")+"锛�"+
+ (Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? "宸插鎵归�氳繃":"宸插鎵归┏鍥�")):null
+ );
+ }
}
-
+ 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());
//鍙戦�侀�氱煡鐭伅
@@ -1775,6 +1917,23 @@
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(),
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType,Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)?10:11))>Constants.ZERO?
+ dingTalk.getCarUseNoticeMsg(carUseBook,carUseBook.getMemberName() + "鎻愪氦鐨勫叕鍔＄敤杞︼紝"+
+ (Constants.equalsInteger(approveDTO.getStatus(),Constants.TWO)? "宸插鎵归�氳繃":"宸插鎵归┏鍥�")):null
+ );
+ }
+ if(StringUtils.isNotBlank(carUseBook.getDdBelongToUnionId())
+ && StringUtils.isNotBlank(carUseBook.getDdToDoId())){
+ //鏍囪褰撳墠閽夐拤瀹℃壒宸插畬鎴�
+ dingTalk.updToDoNoticeInfoStatus(carUseBook.getDdBelongToUnionId(),carUseBook.getDdToDoId());
}
}else if(approveDTO.getObjType().equals(Constants.approveObjectType.reason)){
@@ -1850,13 +2009,39 @@
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()),","),
+ ddNoticeConfigMapper.selectCount(new QueryWrapper<DdNoticeConfig>().lambda()
+ .eq(DdNoticeConfig::getIsdeleted,Constants.ZERO).eq(DdNoticeConfig::getStatus,Constants.ZERO)
+ .eq(DdNoticeConfig::getObjType, Objects.nonNull(visits)?(Constants.equalsInteger(visits.getType(),Constants.TWO)?8:4):12))>Constants.ZERO?
+ Objects.nonNull(visits)?
+ dingTalk.getVisitNoticeMsg(visits,visits.getName()+"鐨�"+(Constants.equalsInteger(visits.getType(),Constants.TWO)?"璁垮鎶ュ":"璁垮鐢宠")+"锛屾妱閫佺粰鎮紝璇风煡鏅�"):
+ dingTalk.getCarUseNoticeMsg(carUseBook,carUseBook.getMemberName() + "鎻愪氦鐨勫叕鍔＄敤杞︼紝鎶勯�佺粰鎮紝璇风煡鏅�"):null
+
+
+
+ );
+ }
+ }
+ }
}
}
--
Gitblit v1.9.3