wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2022-09-29 09:26:11 +08:00
parent 768e24d62a 2f933627ff
commit bdac845f47
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
renren-admin/src/main/java/io/renren/common/aspect/ActivitiNoticeAspect.java
View File

@ -141,7 +141,7 @@ public class ActivitiNoticeAspect {
resourceName.append("'");
resourceName.append(((Map) kv.get("resourceDTO")).get("name"));
resourceName.append("'");
}else if(kv.containsKey("tAbilityApplicationDTOList")){
} else if (kv.containsKey("tAbilityApplicationDTOList")) {
resourceName.append("'");
resourceName.append(((List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList")).get(0).getTitle());
resourceName.append("'");
@ -236,7 +236,7 @@ public class ActivitiNoticeAspect {
resourceName.append("'");
resourceName.append(((Map) kv.get("resourceDTO")).get("name"));
resourceName.append("'");
}else if(kv.containsKey("tAbilityApplicationDTOList")){
} else if (kv.containsKey("tAbilityApplicationDTOList")) {
resourceName.append("'");
resourceName.append(((List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList")).get(0).getTitle());
resourceName.append("'");
@ -280,7 +280,7 @@ public class ActivitiNoticeAspect {
String finalResult = result;
CompletableFuture.runAsync(() -> { // 发起人
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + userDTO.getRealName() + ",您发起的"+resourceName + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + resourceName + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
dto.setTitle("流程结束系统通知");
@ -360,7 +360,7 @@ public class ActivitiNoticeAspect {
resourceName.append("'");
resourceName.append(((Map) kv.get("resourceDTO")).get("name"));
resourceName.append("'");
}else if(kv.containsKey("tAbilityApplicationDTOList")){
} else if (kv.containsKey("tAbilityApplicationDTOList")) {
resourceName.append("'");
resourceName.append(((List<TAbilityApplicationDTO>) kv.get("tAbilityApplicationDTOList")).get(0).getTitle());
resourceName.append("'");
@ -388,7 +388,7 @@ public class ActivitiNoticeAspect {
try {
SysUserDTO assignee = sysUserService.get(Long.valueOf(delegateTask.getAssignee()));
LOGGER.error("审核人：{}", assignee.getId());
String content = "【通知】您发起的流程 " +resourceName+ activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核部门为：\"" + assignee.getDeptName() + "\"；审核负责人\"" + assignee.getRealName() + "\"";
String content = "【通知】您发起的流程 " + resourceName + activitiNoticeOperation.process() + " 当前审核节点为：" + activitiNoticeOperation.value() + "；当前审核部门为：\"" + assignee.getDeptName() + "\"；审核负责人\"" + assignee.getRealName() + "\"";
LOGGER.info("通知内容：{}", content);
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
@ -409,7 +409,7 @@ public class ActivitiNoticeAspect {
}, EXECUTOR).thenRunAsync(() -> { // 审批者
try {
SysUserDTO owner = sysUserService.get(Long.valueOf(finalCreator));
String content = "【通知】" + owner.getRealName() + "发起的流程"+resourceName + activitiNoticeOperation.process() + " 已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您";
String content = "【通知】" + owner.getRealName() + "发起的流程" + resourceName + activitiNoticeOperation.process() + " 已进入审核节点：" + activitiNoticeOperation.value() + "；当前审核人指派为您";
SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2);
dto.setTitle("流程流转系统通知");