From 689b505e5cbf8589711320e317311f73cb1fd571 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 20 十二月 2024 09:51:46 +0800
Subject: [PATCH] 最新版本541200007
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 47 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
index b2be85b..761b297 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java
@@ -82,7 +82,7 @@
@Autowired
private RetentionMapper retentionMapper;
@Autowired
- private VisitsMapper visitsMapper;
+ private VisitsJoinMapper visitsMapper;
@Autowired
private ApproveMapper approveMapper;
@Autowired
@@ -229,6 +229,7 @@
@Override
@Transactional(rollbackFor = {BusinessException.class,Exception.class})
public Integer createFk(Visits visits,Boolean isERP,Integer source) {
+ visits.setId(null);
isValidBaseParam(visits);
//妫�鏌ユ槸鍚﹀繀椤荤瓟棰橈紝骞朵笖绗﹀悎绛旈瑕佹眰
ProblemLog problemLog = isValidProblemLog(visits,source);
@@ -331,6 +332,19 @@
//鍒濆鍖栬瀹俊鎭�
// initVisitInfo(visits,date);
visitsMapper.insert(visits);
+ if(Objects.nonNull(visits.getLoginUserInfo())){
+ SystemUser systemUser = systemUserMapper.selectById(visits.getLoginUserInfo().getId());
+ if(Objects.nonNull(systemUser)&&StringUtils.isNotBlank(systemUser.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendVisitTemplateNotice(systemDictDataBiz,
+ wxNoticeConfigMapper,visits,
+ Constants.equalsInteger(visits.getType(),Constants.TWO)?WxPlatConstants.visitReportContent.visitReportUpload:WxPlatConstants.visitContent.visitUpload,
+ systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_ACCESS_TOKEN).getCode(),
+ Arrays.asList(systemUser.getOpenid().split(","))
+ );
+ }
+ }
+
approveService.createApproveFlow(visits.getType(),visits.getId(),visits.getReceptMemberId());
return visits.getId();
}
@@ -1207,6 +1221,22 @@
result.setBusinessStatus(result.getStatus());
}
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
+ .eq(Notices::getType,Constants.equalsInteger(result.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
+ if(Objects.nonNull(notices)){
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ result.setInfo("寰呮垜澶勭悊");
+ }else{
+ result.setInfo(notices.getInfo());
+ }
+ }
+
+
return result;
}
@@ -1409,6 +1439,21 @@
memberId)
);
// }
+
+ Notices notices = noticesJoinMapper.selectOne(new QueryWrapper<Notices>().lambda()
+ .eq(Notices::getObjId,id)
+ .eq(Notices::getType,Constants.equalsInteger(visits.getType(),Constants.TWO)?Constants.noticesObjectType.visitReporting:Constants.noticesObjectType.visit)
+ .eq(Notices::getUserId,memberId)
+ .eq(Notices::getSendacopy,Constants.ZERO)
+ .orderByDesc(Notices::getId).last(" limit 1 "));
+ if(Objects.nonNull(notices)){
+ if(Constants.equalsInteger(notices.getStatus(),Constants.ZERO)){
+ visitDetailVO.setInfo("寰呮垜澶勭悊");
+ }else{
+ visitDetailVO.setInfo(notices.getInfo());
+ }
+ }
+
return visitDetailVO;
}
@@ -1785,7 +1830,7 @@
SmsEmailServiceImpl.sendVisitTimeOutSms(systemDictDataBiz,
emayService,smsEmailMapper,smsConfigMapper,
SmsConstants.visitContent.visitTimeOutSignOutNum,
- visitReportTimeCount.toString(),Arrays.asList(mobile.split(","))
+ visitTimeCount.toString(),Arrays.asList(mobile.split(","))
);
}
}
--
Gitblit v1.9.3