|
|
@@ -3,10 +3,12 @@ package com.xjrsoft.module.oa.service.impl;
|
|
|
import cn.dev33.satoken.stp.StpUtil;
|
|
|
import cn.hutool.core.bean.BeanUtil;
|
|
|
import cn.hutool.core.util.IdUtil;
|
|
|
+import cn.hutool.core.util.StrUtil;
|
|
|
import com.alibaba.fastjson.JSONObject;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.github.yulichang.base.MPJBaseServiceImpl;
|
|
|
+import com.xjrsoft.config.CommonPropertiesConfig;
|
|
|
import com.xjrsoft.module.oa.dto.AddOfficialDocumentReceivedHandleAlertSetDto;
|
|
|
import com.xjrsoft.module.oa.dto.AddOfficialDocumentReceivedHandleDto;
|
|
|
import com.xjrsoft.module.oa.dto.OfficialDocumentReceivedHandlePageDto;
|
|
|
@@ -40,6 +42,7 @@ public class OfficialDocumentReceivedHandleServiceImpl extends MPJBaseServiceImp
|
|
|
private final OfficialDocumentReceivedMapper documentReceivedMapper;
|
|
|
private final IWeChatService weChatService;
|
|
|
private final UserMapper userMapper;
|
|
|
+ private final CommonPropertiesConfig commonPropertiesConfig;
|
|
|
|
|
|
@Override
|
|
|
public Page<OfficialDocumentReceivedHandlePageVo> getPage(Page<OfficialDocumentReceivedHandlePageVo> page, OfficialDocumentReceivedHandlePageDto dto) {
|
|
|
@@ -106,7 +109,7 @@ public class OfficialDocumentReceivedHandleServiceImpl extends MPJBaseServiceImp
|
|
|
WeChatSendMessageDto weChatSendMessageDto = new WeChatSendMessageDto();
|
|
|
weChatSendMessageDto.setUserId(user.getOpenId());
|
|
|
weChatSendMessageDto.setTemplateId("qmpXORPM1Cocqn503Qa4On6BJhR92UZ00eod2-6IcGo");
|
|
|
- //weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/message/notice/detail?id={}", commonPropertiesConfig.getDomainApp(), id));
|
|
|
+ weChatSendMessageDto.setUrl(StrUtil.format("{}/pages/undertake/detail?id={}", commonPropertiesConfig.getDomainApp(), handle.getOfficialDocumentReceivedId()));
|
|
|
weChatSendMessageDto.setMsgId(IdUtil.getSnowflakeNextIdStr());
|
|
|
JSONObject data = new JSONObject();
|
|
|
|