From 66b258f3e333b2413e3c7c28a8a6794545fc6eb8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 27 二月 2025 09:50:52 +0800
Subject: [PATCH] 流程推进展示工程
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 28 ++++++++++++++++++++--------
1 files changed, 20 insertions(+), 8 deletions(-)
diff --git a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
index 1e1a777..ee84bc4 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -102,6 +102,7 @@
IPage<ProjectProcessVO> page = PageUtil.getPage(query, ProjectProcessVO.class);
baseMapper.getPage(query, page);
for (ProjectProcessVO vo : page.getRecords()) {
+ vo.setStatus(vo.getProjectStatus());
if (Objects.nonNull(vo.getProcessDefId())) {
ProcessDefinition processDefinition = repositoryService.createProcessDefinitionQuery().processDefinitionId(vo.getProcessDefId()).singleResult();
if (Objects.nonNull(processDefinition)) {
@@ -203,8 +204,6 @@
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
- //娴嬭瘯瀹圭己
- variables.put("a", 10);
// 灏嗚椤圭洰鐨勭敵璇蜂汉锛堜笟涓绘柟锛変綔涓烘祦绋嬩腑鏌愪簺鐜妭鐨勫鐞嗕汉
variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
@@ -922,7 +921,7 @@
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
if (Objects.nonNull(sysUser)) {
handlerIds.add(sysUser.getUserId());
- handlerNames.add(sysUser.getNickName());
+ handlerNames.add(this.getUserShowName(sysUser));
if (Objects.nonNull(sysUser.getDept())) {
handlerUnitIds.add(sysUser.getDept().getDeptId());
handlerUnitNames.add(sysUser.getDept().getDeptName());
@@ -970,7 +969,7 @@
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
handlerIds.add(handlerUserId);
- handlerNames.add(handlerUser.getNickName());
+ handlerNames.add(this.getUserShowName(handlerUser));
vo.setActualHandlerUserId(historicTasks.get(0).getAssignee());
vo.setActualHandlerUserName(handlerUser.getNickName());
}
@@ -1004,6 +1003,9 @@
*/
private List<CustomerTaskVO> getFinishedProcessTaskInfo(List<UserTask> userTasks, String processInsId, String processDefId) {
HistoricProcessInstance hisProcess = historyService.createHistoricProcessInstanceQuery().processInstanceId(processInsId).singleResult();
+ if (Objects.isNull(hisProcess)) {
+ return new ArrayList<>();
+ }
List<CustomerTaskVO> vos = userTasks.stream().map(userTask -> {
CustomerTaskVO vo = new CustomerTaskVO();
vo.setProcessInsId(hisProcess.getId());
@@ -1100,7 +1102,7 @@
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
taskVO.getHandlerId().add(sysUser.getUserId());
- taskVO.getHandlerName().add(sysUser.getNickName());
+ taskVO.getHandlerName().add(this.getUserShowName(sysUser));
if (Objects.nonNull(sysUser.getDept())) {
taskVO.getHandlerUnitId().add(sysUser.getDept().getDeptId());
taskVO.getHandlerUnitName().add(sysUser.getDept().getDeptName());
@@ -1288,9 +1290,9 @@
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
vo.getHandlerId().add(handlerUserId);
- vo.getHandlerName().add(handlerUser.getNickName());
+ vo.getHandlerName().add(this.getUserShowName(handlerUser));
vo.setActualHandlerUserId(hisTask.getAssignee());
- vo.setActualHandlerUserName(handlerUser.getNickName());
+ vo.setActualHandlerUserName(this.getUserShowName(handlerUser));
}
vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
this.setPromoterAndHandler(vo, hisTask.getIdentityLinks());
@@ -1301,6 +1303,16 @@
}).collect(Collectors.toList());
result.data(vos);
return vos;
+ }
+
+ /**
+ * 鐢ㄦ埛鍚嶇О鍚庨潰璺熺數璇濆彿鐮�
+ *
+ * @param user
+ * @return
+ */
+ private String getUserShowName(SysUser user) {
+ return user.getNickName() + (StringUtils.isNotBlank(user.getPhonenumber()) ? "(" + user.getPhonenumber() + ")" : "");
}
/**
@@ -1877,7 +1889,7 @@
return user.getUserId() + "";
}).collect(Collectors.joining("銆�")));
taskVO.setPromoterName(userList.stream().map(user -> {
- return user.getNickName();
+ return this.getUserShowName(user);
}).collect(Collectors.joining("銆�")));
taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
return user.getDept().getDeptId() + "";
--
Gitblit v1.8.0