From 1a3a322d6f55d0f812001984d41010524cda69e0 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期五, 06 十二月 2024 15:29:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/VisitsServiceImpl.java | 50 ++++++++++++++++++++++++++++++--------------------
1 files changed, 30 insertions(+), 20 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 f423fd2..85180ac 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
@@ -23,6 +23,8 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.*;
+import com.doumee.core.wx.WXConstant;
+import com.doumee.core.wx.wxPlat.WxPlatConstants;
import com.doumee.core.wx.wxPlat.WxPlatNotice;
import com.doumee.dao.admin.response.InterestedListVO;
import com.doumee.dao.admin.response.PCWorkPlatformDataVO;
@@ -129,6 +131,9 @@
@Autowired
private SmsEmailMapper smsEmailMapper;
+
+ @Autowired
+ private WxNoticeConfigMapper wxNoticeConfigMapper;
@Autowired
private EmayService emayService;
@@ -279,10 +284,6 @@
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(), "瀵逛笉璧凤紝鍙戣捣鎷滆瀹℃壒鐢宠澶辫触锛�");
}
- //鍙戦�佸井淇″叕浼楀彿閫氱煡
- wxPlatNotice.sendVisitAuditTemplateNotice(visits,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
}else if(dataSyncConfig.getVisitorDataOrigin().equals(Constants.ZERO)){
visits.setStatus(Constants.VisitStatus.waitCheck);
visitsMapper.updateById(visits);
@@ -292,6 +293,17 @@
}
initWithVisitInfo(visits);
updateProblemLog(visits,problemLog,member);
+
+ //鍙戦�佸井淇″叕浼楀彿閫氱煡 - 鐢宠鎻愪氦鎴愬姛寰呭鏍�
+ if(StringUtils.isNotBlank(visits.getOpenid())){
+ WxPlatNotice wxPlatNotice = new WxPlatNotice();
+ wxPlatNotice.sendVisitTemplateNotice(
+ 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(visits.getOpenid().split(","))
+ );
+ }
//鍒涘缓瀹℃壒璁板綍
createApprove(visits,visitMember);
@@ -1486,11 +1498,6 @@
if(Constants.equalsInteger(visits.getStatus(),Constants.VisitStatus.xfSuccess)){
//濡傛灉涓嬪彂鎴愬姛锛�
visitsMapper.updateById(visits);
- if(Objects.isNull(visits.getParentId())){
- wxPlatNotice.sendVisitAuditTemplateNotice(visits,
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_PREFIX).getCode(),
- systemDictDataBiz.queryByCode(Constants.WX_PLATFORM,Constants.WX_PLATFORM_AUDIT_VISIT).getCode());
- }
}else{
throw new BusinessException(ResponseStatus.SERVER_ERROR.getCode(),"閲嶆柊涓嬪彂浼氬け璐ワ紒");
}
@@ -1661,25 +1668,28 @@
pcWorkPlatformDataVO.setLwList(lwList );
}else if(Constants.equalsInteger(queryType,Constants.THREE)) {
- MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
- queryWrapper.selectAll(Notices.class);
if (Objects.isNull(loginUserInfo.getMemberId())) {
- queryWrapper.eq("1", "2");
+ pcWorkPlatformDataVO.setNoticesList(new ArrayList<>());
+ pcWorkPlatformDataVO.setNoticesNum(0);
+// queryWrapper.eq("1", "2");
} else {
+ MPJLambdaWrapper<Notices> queryWrapper = new MPJLambdaWrapper<>();
+ queryWrapper.selectAll(Notices.class);
queryWrapper.eq(Notices::getStatus, Constants.ZERO);
queryWrapper.eq(Notices::getSendacopy, Constants.ZERO);
queryWrapper.eq(Notices::getParam2, Constants.ZERO);
queryWrapper.eq(Notices::getUserId, loginUserInfo.getMemberId());
- }
- queryWrapper.orderByDesc(Notices::getCreateDate);
- List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
- pcWorkPlatformDataVO.setNoticesList(noticesList);
- pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
- if(noticesList.size() > 5 ){
- pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
- }else{
+ queryWrapper.orderByDesc(Notices::getCreateDate);
+ List<Notices> noticesList = noticesJoinMapper.selectList(queryWrapper);
pcWorkPlatformDataVO.setNoticesList(noticesList);
+ pcWorkPlatformDataVO.setNoticesNum(noticesList.size());
+ if(noticesList.size() > 5 ){
+ pcWorkPlatformDataVO.setNoticesList(noticesList.subList(0,5));
+ }else{
+ pcWorkPlatformDataVO.setNoticesList(noticesList);
+ }
}
+
}else{
String code= systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.TIMEOUT_WARNING).getCode();
MPJLambdaWrapper<Visits> queryWrapper = new MPJLambdaWrapper<>();
--
Gitblit v1.9.3