|
@@ -27,6 +27,7 @@ import com.redxun.knowledge.entity.vo.KnowledgeApprovalListVo;
|
|
|
import com.redxun.knowledge.entity.vo.KnowledgeCategoryAdminVo;
|
|
|
import com.redxun.knowledge.mapper.KnowledgeApproveMapper;
|
|
|
import com.redxun.knowledge.mapper.KnowledgeMapper;
|
|
|
+import com.redxun.knowledge.qywexin.QYWechatUtils;
|
|
|
import com.redxun.knowledge.utils.PageListUtils;
|
|
|
import com.redxun.search.service.SearchService;
|
|
|
import com.redxun.search.utils.FileInputStreamUtils;
|
|
@@ -309,22 +310,22 @@ public class KnowledgeApproveServiceImpl extends SuperServiceImpl<KnowledgeAppro
|
|
|
* @param createBy,remark,flag
|
|
|
*/
|
|
|
private void sendMessage(String createBy, String titles, String remark, Boolean flag) {
|
|
|
+ String[] qyUser = new String[]{createBy};
|
|
|
List<OsUserDto> osUserDtoList = new ArrayList<>();
|
|
|
//查询用户信息
|
|
|
OsUserDto osUserDto = userService.queryOsUserDto(createBy);
|
|
|
osUserDtoList.add(osUserDto);
|
|
|
// 知识通过
|
|
|
if (flag) {
|
|
|
- messageService.sendWechatMsg("您提交的申请已经通过审批!",
|
|
|
- "提交内容:" + titles + "<br>" +
|
|
|
- "审批时间:" + DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN), osUserDtoList);
|
|
|
+ QYWechatUtils.send(qyUser,"您提交的申请已经通过审批!" + "<br>" +
|
|
|
+ "提交内容:" + titles + "<br>" + "审批时间:" + DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
|
|
|
messageService.sendInnerMsg("您提交的申请已经通过审批!",
|
|
|
"提交内容:" + titles + "<br>" +
|
|
|
"审批时间:" + DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN), osUserDtoList);
|
|
|
} else {
|
|
|
// 知识不通过
|
|
|
- messageService.sendWechatMsg("您提交的申请已被驳回!", "" +
|
|
|
- "提交内容:" + titles + "<br>" + "审批时间:" + DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN), osUserDtoList);
|
|
|
+ QYWechatUtils.send(qyUser,"您提交的申请已被驳回!" + "<br>" +
|
|
|
+ "提交内容:" + titles + "<br>" + "审批时间:" + DateUtil.format(new Date(), DatePattern.NORM_DATETIME_PATTERN));
|
|
|
messageService.sendInnerMsg("您提交的申请已被驳回!",
|
|
|
"提交内容:" + titles + "<br>" +
|
|
|
"驳回原因:" + remark + "<br>" +
|
|
@@ -340,16 +341,17 @@ public class KnowledgeApproveServiceImpl extends SuperServiceImpl<KnowledgeAppro
|
|
|
* @param
|
|
|
*/
|
|
|
public void sendMessage(String sender, String titles, String userId, Date date) {
|
|
|
+ String[] qyUser = new String[]{sender};
|
|
|
List<OsUserDto> osUserDtoList = new ArrayList<>();
|
|
|
//查询用户信息
|
|
|
OsUserDto osUserDto = userService.queryOsUserDto(sender);
|
|
|
osUserDtoList.add(osUserDto);
|
|
|
// 发消息通过前来审核
|
|
|
- messageService.sendWechatMsg("您有一条待审核任务,请尽快完成审核!",
|
|
|
+ QYWechatUtils.send(qyUser,"您有一条待审核任务,请尽快完成审核!" + "<br>" +
|
|
|
"审核类型:知识审核" + "<br>" +
|
|
|
"提交内容:" + titles + "<br>" +
|
|
|
"提交人:" + userService.queryUser(userId).getFullName() + "<br>" +
|
|
|
- "提交时间:" + DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN), osUserDtoList);
|
|
|
+ "提交时间:" + DateUtil.format(date, DatePattern.NORM_DATETIME_PATTERN));
|
|
|
messageService.sendInnerMsg("您有一条待审核任务,请尽快完成审核!", "审核类型:知识审核" + "<br>" +
|
|
|
"提交内容:" + titles + "<br>" +
|
|
|
"提交人:" + userService.queryUser(userId).getFullName() + "<br>" +
|