diff --git a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java index 3015af64..26be1a7b 100644 --- a/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java +++ b/renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java @@ -190,7 +190,8 @@ public class ActivitiNoticeAspect { CompletableFuture.runAsync(() -> { // 发起人 SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); String content = "【通知】" + userDTO.getRealName() + ",您发起的" + resourceName + " " + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + " 节点" + finalResult; - Integer type = 10; + SysNoticeDTO dto = new SysNoticeDTO(); + Integer type = 12; if ("能力申请流程".equals(activitiNoticeOperation.process())) { type = 0; } else if ("能力资源上架".equals(activitiNoticeOperation.process())) { @@ -202,8 +203,8 @@ public class ActivitiNoticeAspect { } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) { type = 8; } - SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(type); + dto.setApplyId(delegateTask.getExecution().getProcessInstanceId()); dto.setTitle("流程节点系统通知"); dto.setContent(content); // 通知内容 dto.setReceiverType(1); @@ -214,9 +215,6 @@ public class ActivitiNoticeAspect { dto.setCreator(sysUserService.getByUsername("admin").getId()); dto.setCreateDate(new Date()); dto.setFrom("通知"); - if (tAbilityApplicationDTOList != null) { - dto.setApplyId(tAbilityApplicationDTOList.get(0).getApplyFlag()); - } dto.setApplyState(0); sysNoticeService.save(dto); }, EXECUTOR); @@ -302,6 +300,7 @@ public class ActivitiNoticeAspect { CompletableFuture.runAsync(() -> { // 发起人 SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); String content = "【通知】" + userDTO.getRealName() + ",您发起的 " + resourceName + " " + activitiNoticeOperation.process() + "已完成,审核结果为:" + finalResult; + SysNoticeDTO dto = new SysNoticeDTO(); Integer type = 10; if ("能力申请流程".equals(activitiNoticeOperation.process())) { type = 0; @@ -314,8 +313,8 @@ public class ActivitiNoticeAspect { } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) { type = 8; } - SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(type); + dto.setApplyId(execution.getProcessInstanceId()); dto.setTitle("流程结束系统通知"); dto.setContent(content); // 通知内容 dto.setReceiverType(1); @@ -326,9 +325,6 @@ public class ActivitiNoticeAspect { dto.setCreator(sysUserService.getByUsername("admin").getId()); dto.setCreateDate(new Date()); dto.setFrom("通知"); - if (tAbilityApplicationDTOList != null) { - dto.setApplyId(tAbilityApplicationDTOList.get(0).getApplyFlag()); - } dto.setApplyState(0); sysNoticeService.save(dto); }, EXECUTOR).thenRunAsync(() -> { @@ -443,6 +439,7 @@ public class ActivitiNoticeAspect { LOGGER.error("审核人:{}", assignee.getId()); String content = "【通知】您发起的流程 " + resourceName + activitiNoticeOperation.process() + " 当前审核节点为:" + activitiNoticeOperation.value() + ";当前审核部门为:\"" + assignee.getDeptName() + "\";审核负责人\"" + assignee.getRealName() + "\""; LOGGER.info("通知内容:{}", content); + SysNoticeDTO dto = new SysNoticeDTO(); Integer type = 10; if ("能力申请流程".equals(activitiNoticeOperation.process())) { type = 0; @@ -455,8 +452,8 @@ public class ActivitiNoticeAspect { } else if ("需求评论审核流程".equals(activitiNoticeOperation.process())) { type = 8; } - SysNoticeDTO dto = new SysNoticeDTO(); dto.setType(type); + dto.setApplyId(delegateTask.getProcessInstanceId()); dto.setTitle("流程流转系统通知"); dto.setContent(content); // 通知内容 dto.setReceiverType(1); @@ -467,9 +464,6 @@ public class ActivitiNoticeAspect { dto.setCreator(sysUserService.getByUsername("admin").getId()); dto.setCreateDate(new Date()); dto.setFrom("通知"); - if (tAbilityApplicationDTOList != null) { - dto.setApplyId(tAbilityApplicationDTOList.get(0).getApplyFlag()); - } dto.setApplyState(0); sysNoticeService.save(dto); } catch (Exception exception) { diff --git a/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java b/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java index 161b24e4..43447ffb 100644 --- a/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java +++ b/renren-admin/src/main/java/io/renren/modules/demandComment/service/impl/TDemandCommentServiceImpl.java @@ -98,7 +98,9 @@ public class TDemandCommentServiceImpl extends CrudServiceImpl