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-07-21 17:29:38 +08:00
parent aa4b0d3d70 66ae7d2fe6
commit 1af2b0e48e
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -168,7 +168,7 @@ public class ActivitiNoticeAspect {
Optional<ResourceDTO> resourceDTO = Optional.ofNullable(resourceService.get(resourceId)); Optional<ResourceDTO> resourceDTO = Optional.ofNullable(resourceService.get(resourceId));
kv.get("resourceId"); kv.get("resourceId");
kv.get("id"); kv.get("id");
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + (resourceDTO.isPresent() ? resourceDTO.get().getName() : "") + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult; String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + " " + activitiNoticeOperation.value() + "节点" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO(); SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2); dto.setType(2);
dto.setTitle("流程节点系统通知"); dto.setTitle("流程节点系统通知");
@ -248,7 +248,7 @@ public class ActivitiNoticeAspect {
SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator)); SysUserDTO userDTO = sysUserService.get(Long.valueOf(finalCreator));
kv.get("resourceId"); kv.get("resourceId");
kv.get("id"); kv.get("id");
String content = "【通知】" + userDTO.getRealName() + ",您发起的" + (resourceDTO.isPresent() ? resourceDTO.get().getName() : "申请摄像头列表") + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult; String content = "【通知】" + userDTO.getRealName() + ",您发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
SysNoticeDTO dto = new SysNoticeDTO(); SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2); dto.setType(2);
dto.setTitle("流程结束系统通知"); dto.setTitle("流程结束系统通知");
@ -274,7 +274,7 @@ public class ActivitiNoticeAspect {
SysNoticeDTO dto = new SysNoticeDTO(); SysNoticeDTO dto = new SysNoticeDTO();
dto.setType(2); dto.setType(2);
dto.setTitle("流程结束系统通知"); dto.setTitle("流程结束系统通知");
String content = "【通知】" + user.getRealName() + "," + creatorDTO.getRealName() + "发起的" + (resourceDTO.isPresent() ? resourceDTO.get().getName() : "") + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult; String content = "【通知】" + user.getRealName() + "," + creatorDTO.getRealName() + "发起的" + activitiNoticeOperation.process() + "已完成，审核结果为：" + finalResult;
dto.setContent(content); // 通知内容 dto.setContent(content); // 通知内容
dto.setReceiverType(1); dto.setReceiverType(1);
dto.setReceiverTypeIds(userDTO.get().getId().toString()); dto.setReceiverTypeIds(userDTO.get().getId().toString());

7
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -238,12 +238,13 @@ public class TAbilityApplicationController {
put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id put("instanceId", tAbilityApplicationDTOList.get(0).getInstanceId()); // 流程id
put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息 put("resourceOwnerDept", tAbilityApplicationDTOList.get(0).getResourceOwnerDept()); // 资源所属部门信息
put("resources", resourceDTOS);//申请的该部门的能力资源 put("resources", resourceDTOS);//申请的该部门的能力资源
if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("通过")) { if (tAbilityApplicationDTOList.get(0).getApproveStatus().equals("审核中")) {
put("ended", true);
} else {
put("ended", false); put("ended", false);
} else {
put("ended", true);
} }
put("taskHandleDetailInfo", taskHandleDetailInfo); // 流程详情 put("taskHandleDetailInfo", taskHandleDetailInfo); // 流程详情
put("approveStatus", tAbilityApplicationDTOList.get(0).getApproveStatus());
if (!finalCamera.isEmpty()) { if (!finalCamera.isEmpty()) {
put("camera", finalCamera); // 流程详情 put("camera", finalCamera); // 流程详情
} }