请假流程进一步完善,解决固定值问题
This commit is contained in:
@@ -38,7 +38,8 @@ public class BoStartListener implements ExecutionListener {
|
||||
StuLeaveApplication stuLeaveApplication = leaveMapper.selectRtStuLeaveApplicationByLeaveApplicationId(leaveApplicationId);
|
||||
|
||||
// 获取校领导信息
|
||||
List<TeacherVo> lingDataInfo = leaveMapper.getLingDataInfo(185362L);
|
||||
String roleKey = "xldsp"; //角色key
|
||||
List<TeacherVo> lingDataInfo = leaveMapper.getShenDataInfo(roleKey);
|
||||
|
||||
// 设置流程变量
|
||||
//delegateExecution.setVariable("approval", secondaryLeaderInfo.getUserId());
|
||||
|
||||
@@ -104,9 +104,13 @@ public class LeadAuditListener implements ExecutionListener {
|
||||
notificationManage.setSender(Long.parseLong(approval)); // 发送方
|
||||
}
|
||||
if(leaveDay >= 8 && leaveDay <= 14) {
|
||||
//获取学工领导信息
|
||||
String roleKey = "xgldsp"; //角色key
|
||||
List<TeacherVo> xueDataInfo = leaveMapper.getShenDataInfo(roleKey);
|
||||
|
||||
//查询指定用户的通知信息
|
||||
notificationManage.setContent("您有一条【二级学院书记已提交请假申请审批】需待处理"); // 消息内容
|
||||
notificationManage.setReceiver(Long.parseLong("185043")); //接收人需添加appvoval
|
||||
notificationManage.setReceiver(Long.parseLong(xueDataInfo.get(0).getUserId().toString())); //接收人需添加appvoval//185043
|
||||
NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage);
|
||||
if(userManage != null) {
|
||||
//删除指定通知信息
|
||||
@@ -119,8 +123,12 @@ public class LeadAuditListener implements ExecutionListener {
|
||||
notificationManage.setSender(Long.parseLong(approval)); // 发送方
|
||||
}
|
||||
if(leaveDay >= 15 && leaveDay <= 30) {
|
||||
//获取校领导信息
|
||||
String roleKey = "xldsp"; //角色key
|
||||
List<TeacherVo> lingDataInfo = leaveMapper.getShenDataInfo(roleKey);
|
||||
|
||||
notificationManage.setContent("您有一条【学工领导已提交请假申请审批】需待处理"); // 消息内容
|
||||
notificationManage.setReceiver(185362L); //接收人
|
||||
notificationManage.setReceiver(lingDataInfo.get(0).getUserId()); //接收人185362
|
||||
NotificationManage userManage = leaveMapper.selectCphMsgListForFlowable(notificationManage);
|
||||
if(userManage != null) {
|
||||
//删除指定通知信息
|
||||
@@ -130,7 +138,7 @@ public class LeadAuditListener implements ExecutionListener {
|
||||
|
||||
//构建通知信息内容
|
||||
notificationManage.setContent("您有一条【学院领导已提交请假申请审批】待处理"); // 消息内容
|
||||
notificationManage.setSender(185362L); // 发送方
|
||||
notificationManage.setSender(lingDataInfo.get(0).getUserId()); // 发送方185362
|
||||
}
|
||||
notificationManage.setReceiver(shenUserInfo.getUserId());
|
||||
notificationManage.setCreateTime(DateUtils.getNowDate());
|
||||
|
||||
@@ -51,7 +51,8 @@ public class LeadEentListener implements ExecutionListener {
|
||||
|
||||
// 获取校领导信息
|
||||
//TeacherVo updateDeptId = leaveMapper.getUpdateDeptId(SecurityUtils.getUserId().toString());
|
||||
List<TeacherVo> lingDataInfo = leaveMapper.getLingDataInfo(185362L);
|
||||
String roleKey = "xldsp"; //角色key
|
||||
List<TeacherVo> lingDataInfo = leaveMapper.getShenDataInfo(roleKey);
|
||||
|
||||
if (stuLeaveApplication != null) {
|
||||
// 同意
|
||||
|
||||
@@ -87,12 +87,12 @@ public interface LeaveMapper {
|
||||
List<TeacherVo> getUpdateDeptIdInfo(Long deptId);
|
||||
|
||||
/**
|
||||
* 获取校领导信息
|
||||
* @param userId
|
||||
* 获取审批用户信息
|
||||
* @param roleKey
|
||||
* @return
|
||||
* 邵政文
|
||||
*/
|
||||
List<TeacherVo> getLingDataInfo(Long userId);
|
||||
List<TeacherVo> getShenDataInfo(String roleKey);
|
||||
|
||||
/**
|
||||
* 获取请假申请人信息
|
||||
|
||||
Reference in New Issue
Block a user