xgxt_sd/zhxg_java
16
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

应征入伍保留学籍工作流

Browse Source
This commit is contained in:
陈
2025-11-10 17:41:23 +08:00
parent aa3246d2cc
commit 434cbc0c0e
5 changed files with 181 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
srs-flowable/src/main/java/com/srs/flowable/service/impl/FlowTaskServiceImpl.java
View File

@@ -6,6 +6,7 @@ import com.alibaba.fastjson2.JSONObject;
import com.alibaba.fastjson2.TypeReference;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.srs.common.core.domain.AjaxResult;
import com.srs.common.core.domain.entity.SysDept;
import com.srs.common.core.domain.entity.SysRole;
import com.srs.common.core.domain.entity.SysUser;
@@ -27,6 +28,7 @@ import com.srs.flowable.service.IFlowTaskService;
import com.srs.flowable.service.ISysDeployFormService;
import com.srs.flowable.service.ISysFormService;
import com.srs.system.domain.SysForm;
import com.srs.system.mapper.SysDeptMapper;
import com.srs.system.service.ISysRoleService;
import com.srs.system.service.ISysUserService;
import com.sun.jna.platform.win32.OaIdl;
@@ -55,6 +57,7 @@ import org.flowable.task.api.Task;
import org.flowable.task.api.TaskQuery;
import org.flowable.task.api.history.HistoricTaskInstance;
import org.flowable.task.api.history.HistoricTaskInstanceQuery;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@@ -818,6 +821,9 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
return t -> seen.add(keyExtractor.apply(t));
}
@Autowired
SysDeptMapper sysDeptMapper;
/**
* 流程历史流转记录
*
@@ -876,8 +882,22 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
stringBuilder.append(sysUser.getNickName()).append(",");
}
if (StringUtils.isNotBlank(identityLink.getGroupId())) {
// SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
// stringBuilder.append(sysRole.getRoleName()).append(",");
// 尝试按角色ID查询
SysRole sysRole = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
stringBuilder.append(sysRole.getRoleName()).append(",");
if (sysRole != null) {
stringBuilder.append(sysRole.getRoleName()).append(",");
} else {
// 若角色不存在，尝试按部门ID查询（很多场景下groupId实际是部门ID）
SysDept sysDept = sysDeptMapper.selectDeptById(Long.parseLong(identityLink.getGroupId()));
if (sysDept != null) {
stringBuilder.append(sysDept.getDeptName()).append(",");
} else {
// 若都不存在，显示原始ID（避免报错，方便排查）
stringBuilder.append("未知分组(").append(identityLink.getGroupId()).append("),");
}
}
}
}
}