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

Merge branch 'dev'

This commit is contained in:
wangliwen 2022-10-10 10:16:36 +08:00
parent 53725af1b2 7169d9ee73
commit 2538479e36
2 changed files with 157 additions and 156 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
renren-admin/src/main/java/io/renren/modules/meeting/controller/BookMeetingRoomController.java
View File

@ -37,10 +37,8 @@ public class BookMeetingRoomController {
@Value("${big_date.name}") @Value("${big_date.name}")
private String bigDateDeptName; // 大数据局名称 private String bigDateDeptName; // 大数据局名称
@Value("${big_date.default_assignee_role_id}") @Value("${big_date.assignee_meet_role_id}")
private String defaultAssigneeRoleId; // 当某部门未设置部门审批人时，将使用该用户审批 private String defaultAssigneeRoleId; // 改成配置的会议室审核人
@Value("${big_date.assignee_role_name}")
private String roleName; // 具备审批的角色名称
@Resource @Resource
private TMeetingroomBookService tMeetingroomBookService; private TMeetingroomBookService tMeetingroomBookService;
@ -106,6 +104,7 @@ public class BookMeetingRoomController {
sysNoticeDTO.setTitle("会议室申请审核通知"); sysNoticeDTO.setTitle("会议室申请审核通知");
sysNoticeDTO.setContent(content); // 通知内容 sysNoticeDTO.setContent(content); // 通知内容
sysNoticeDTO.setReceiverType(1); sysNoticeDTO.setReceiverType(1);
sysNoticeDTO.setReceiverTypeIds(defaultAssigneeRoleId); sysNoticeDTO.setReceiverTypeIds(defaultAssigneeRoleId);
sysNoticeDTO.setStatus(NoticeStatusEnum.SEND.value()); sysNoticeDTO.setStatus(NoticeStatusEnum.SEND.value());
sysNoticeDTO.setSenderName("流程系统"); sysNoticeDTO.setSenderName("流程系统");
@ -116,7 +115,7 @@ public class BookMeetingRoomController {
sysNoticeService.save(sysNoticeDTO); sysNoticeService.save(sysNoticeDTO);
// 还要发送自己能看到的的谁给我审核的消息 // 还要发送自己能看到的的谁给我审核的消息
String ownedContent = "【通知】您发起的" + dto.getRoomName() + String ownedContent = "【通知】您发起的" + dto.getRoomName() +
"会议室申请,当前审核部门为：" + bigDateDeptName + "，审核负责人：" + roleName; "会议室申请,当前审核部门为：" + bigDateDeptName + "，审核负责人：会议室管理员" ;
SysNoticeDTO ownedSysNoticeDTO = new SysNoticeDTO(); SysNoticeDTO ownedSysNoticeDTO = new SysNoticeDTO();
ownedSysNoticeDTO.setType(2); ownedSysNoticeDTO.setType(2);
ownedSysNoticeDTO.setTitle("会议室申请发起通知"); ownedSysNoticeDTO.setTitle("会议室申请发起通知");

2
renren-admin/src/main/resources/application.yml
View File

@ -14,6 +14,8 @@ big_date:
assignee_city_role_name: 市审批人 assignee_city_role_name: 市审批人
# 当某部门未设置部门审批人时，将使用该用户审批 # 当某部门未设置部门审批人时，将使用该用户审批
default_assignee_role_id: 1516728698224427010 default_assignee_role_id: 1516728698224427010
# 会议室审核员
assignee_meet_role_id: 1576849766277849089
# 需要进行统计数目的资源 type/需要进行统计申请的资源类型 applyType # 需要进行统计数目的资源 type/需要进行统计申请的资源类型 applyType
census: census:
type: 组件服务,应用资源,基础设施,数据资源,知识库 type: 组件服务,应用资源,基础设施,数据资源,知识库