From 42a7552b9c8603aeab7f0785eb05270dfbeb0bd3 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期日, 02 三月 2025 10:16:20 +0800
Subject: [PATCH] Merge branch 'master' into dev
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 364 ++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 268 insertions(+), 96 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 6ac5ced..ca1ea6f 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -1,7 +1,6 @@
package com.ycl.service.impl;
-import com.alibaba.fastjson2.JSON;
import com.alibaba.fastjson2.JSONArray;
import com.alibaba.fastjson2.JSONObject;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -11,20 +10,15 @@
import com.ycl.common.constant.ProcessConstants;
import com.ycl.common.constant.ProcessOverTimeConstants;
import com.ycl.common.core.domain.entity.SysDept;
+import com.ycl.common.core.domain.entity.SysDictData;
import com.ycl.common.core.domain.entity.SysRole;
import com.ycl.common.core.domain.entity.SysUser;
-import com.ycl.common.enums.business.HandlerTypeEnum;
-import com.ycl.common.enums.business.ProcessLogEventTypeEnum;
-import com.ycl.common.enums.business.SuperviseTypeEnum;
-import com.ycl.common.enums.business.TaskStatusEnum;
+import com.ycl.common.enums.business.*;
import com.ycl.common.utils.SecurityUtils;
import com.ycl.constant.TaskTypeConstant;
import com.ycl.domain.entity.*;
import com.ycl.domain.form.*;
-import com.ycl.domain.json.DelegateData;
-import com.ycl.domain.json.HangupData;
-import com.ycl.domain.json.JumpData;
-import com.ycl.domain.json.SuperviseData;
+import com.ycl.domain.json.*;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.IndexCustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
@@ -38,6 +32,7 @@
import com.ycl.domain.query.ProjectProcessQuery;
import com.ycl.service.common.TaskCommonService;
import com.ycl.system.service.ISysDeptService;
+import com.ycl.system.service.ISysDictTypeService;
import com.ycl.system.service.ISysRoleService;
import com.ycl.system.service.ISysUserService;
import lombok.Synchronized;
@@ -93,6 +88,8 @@
private final ApplicationEventPublisher publisher;
private final ISysDeptService deptService;
private final ProcessLogService processLogService;
+ private final ISysDictTypeService dictTypeService;
+ private final ProcessConfigInfoService processConfigInfoService;
/**
* 鍒嗛〉鏌ヨ
@@ -105,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)) {
@@ -143,22 +141,22 @@
}
}
ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
- .select(ProjectInfo::getCreateBy)
+ .select(ProjectInfo::getProjectOwnerUnit)
.eq(ProjectInfo::getId, form.getProjectId())
.one();
if (Objects.isNull(project)) {
throw new RuntimeException("椤圭洰涓嶅瓨鍦�");
}
- SysUser user = sysUserService.selectUserById(project.getCreateBy());
- if (Objects.isNull(user)) {
+ SysDept dept = deptService.selectDeptById(project.getProjectOwnerUnit());
+ if (Objects.isNull(dept)) {
throw new RuntimeException("椤圭洰涓氫富鍗曚綅涓嶅瓨鍦�");
}
- String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId(), user.getDeptId());
+ String processInsId = this.startPro(form.getProjectId(), form.getProcessDefId(), dept.getDeptId());
new LambdaUpdateChainWrapper<>(baseMapper)
.eq(ProjectProcess::getProjectId, form.getProjectId())
.set(ProjectProcess::getProcessDefId, form.getProcessDefId())
.set(ProjectProcess::getProcessInsId, processInsId)
- .set(ProjectProcess::getDataLaunch, project.getCreateBy())
+ .set(ProjectProcess::getDataLaunch, project.getProjectOwnerUnit())
.update();
return Result.ok("娴佺▼鍙樻洿鎴愬姛");
@@ -167,23 +165,20 @@
@Override
@Transactional(rollbackFor = Exception.class)
public Result startProcess(Long projectId, String processDefId) {
- ProjectInfo project = new LambdaQueryChainWrapper<>(projectInfoMapper)
- .select(ProjectInfo::getCreateBy)
- .eq(ProjectInfo::getId, projectId)
- .one();
+ ProjectInfo project = projectInfoMapper.selectById(projectId);
if (Objects.isNull(project)) {
throw new RuntimeException("椤圭洰涓嶅瓨鍦�");
}
- SysUser user = sysUserService.selectUserById(project.getCreateBy());
- if (Objects.isNull(user)) {
+ SysDept dept = deptService.selectDeptById(project.getProjectOwnerUnit());
+ if (Objects.isNull(dept)) {
throw new RuntimeException("椤圭洰涓氫富鍗曚綅涓嶅瓨鍦�");
}
- String processInsId = this.startPro(projectId, processDefId, user.getDeptId());
+ String processInsId = this.startPro(projectId, processDefId, dept.getDeptId());
ProjectProcess entity = new ProjectProcess();
entity.setProjectId(projectId);
entity.setProcessDefId(processDefId);
entity.setProcessInsId(processInsId);
- entity.setDataLaunch(project.getCreateBy());
+ entity.setDataLaunch(project.getProjectOwnerUnit());
baseMapper.insert(entity);
return Result.ok("娴佺▼鍚姩鎴愬姛");
@@ -209,8 +204,6 @@
SysUser sysUser = SecurityUtils.getLoginUser().getUser();
identityService.setAuthenticatedUserId(sysUser.getUserId().toString());
variables.put(ProcessConstants.PROCESS_INITIATOR, sysUser.getUserId());
- //娴嬭瘯瀹圭己
- variables.put("miss", true);
// 灏嗚椤圭洰鐨勭敵璇蜂汉锛堜笟涓绘柟锛変綔涓烘祦绋嬩腑鏌愪簺鐜妭鐨勫鐞嗕汉
variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
@@ -291,7 +284,7 @@
this.getRemainingTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
break;
case TaskTypeConstant.TIMELY:
- this.getTimelyTask(query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
+ this.getTimelyTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
break;
case TaskTypeConstant.OVERTIME:
this.getOvertimeTask(query.getProjectId(), query.getProcessDefId(), projectProcess.getProcessInsId(), query.getTaskName(), (int) query.getCurrentPage(), (int) query.getPageSize(), ok);
@@ -312,9 +305,15 @@
.active()
.includeProcessVariables()
.orderByTaskCreateTime().desc();
-
+ List<String> insIds = baseMapper.getNormalInsIds();
+ if (CollectionUtils.isEmpty(insIds)) {
+ result.data(new ArrayList<>()).total(0L);
+ return;
+ } else {
+ taskQuery.processInstanceIdIn(insIds);
+ }
if (StringUtils.isNotBlank(taskName)) {
- taskQuery.processDefinitionNameLike(taskName);
+ taskQuery.taskNameLike(taskName);
}
if (!SecurityUtils.getLoginUser().getUser().isAdmin()) {
taskQuery
@@ -413,13 +412,48 @@
if (processLogService.taskIsHangup(task.getId(), task.getProcessInstanceId())) {
taskVO.setTaskStatus(TaskStatusEnum.HANGUP);
}
+
+ // 璁＄畻鍔炵悊鏃堕棿
+ ProcessCoding processCoding = processCodingService.getByTaskId(task.getId());
+ if (processCoding != null) {
+ if (StringUtils.isNotBlank(processCoding.getOvertime())) {
+ Long overtime = getTime(processCoding.getOvertime());
+ long durationTime = 0l;
+ if (Objects.nonNull(processCoding.getStartTaskTime())) {
+ durationTime = ((new Date()).getTime() - processCoding.getStartTaskTime().getTime()) / 1000;
+ } else {
+ taskVO.setRemainingTime("鏈缃姙鐞嗘椂闂�");
+ }
+ if (overtime > durationTime) {
+ taskVO.setRemainingTime((overtime - durationTime) / 3600 + "灏忔椂");
+ } else {
+ taskVO.setRemainingTime("宸茶秴鏃�");
+ }
+ } else {
+ taskVO.setRemainingTime("-");
+ }
+ }
this.distinctVo(taskVO);
vos.add(taskVO);
}
- if (vos.size() < pageSize) {
- result.total(vos.size());
- }
result.put("taskList", vos);
+ }
+
+ private Long getTime(String timeStr) {
+ Long time = null;
+ if (StringUtils.isNotBlank(timeStr)) {
+ String[] timeArr = timeStr.split("-");
+ // 瑙ｆ瀽澶╂暟鍜屽皬鏃舵暟
+ int days = Integer.parseInt(timeArr[0]);
+ int hours = 0;
+ if (timeArr.length > 1) {
+ hours = Integer.parseInt(timeArr[1]);
+ }
+ time = (days * 24L + hours) * 3600L;
+// //鍒�-绉�
+// time= (days * 60L) + hours;
+ }
+ return time;
}
@Override
@@ -613,7 +647,7 @@
jsonData.setAfterHandlerIds(afterHandlerIds);
jsonData.setAfterHandlerType(form.getPeopleType());
// 鍙戝竷杞姙浜嬩欢
- publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), task.getId(), task.getName(),ProcessLogEventTypeEnum.DELEGATE, jsonData));
+ publisher.publishEvent(new TaskLogEvent(this, null, SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), task.getId(), task.getName(), ProcessLogEventTypeEnum.DELEGATE, jsonData));
return Result.ok("杞姙鎴愬姛");
}
@@ -624,7 +658,7 @@
Task task = taskService.createTaskQuery().taskId(form.getTaskId()).processInstanceId(form.getProcessInsId()).singleResult();
if (Objects.nonNull(task)) {
// 娣诲姞璺宠繃鏃ュ織
- publisher.publishEvent(new TaskLogEvent(this, null,SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(),ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
+ publisher.publishEvent(new TaskLogEvent(this, null, SecurityUtils.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(), ProcessLogEventTypeEnum.JUMP, new JumpData(form.getDesc())));
// 鏌ュ嚭璇ヤ换鍔＄粦瀹氱殑琛ㄥ崟
Map<String, Object> data = new HashMap<>(1);
@@ -668,7 +702,7 @@
}
dataList.add(jsonData);
//娣诲姞鐫ｅ姙鏃ュ織
- publisher.publishEvent(new TaskLogEvent(this, processLog.getId(), processLog.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(),ProcessLogEventTypeEnum.SUPERVISE, dataList));
+ publisher.publishEvent(new TaskLogEvent(this, processLog.getId(), processLog.getUserId(), form.getProjectId(), form.getProcessInsId(), form.getTaskId(), task.getName(), ProcessLogEventTypeEnum.SUPERVISE, dataList));
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -698,7 +732,7 @@
task.getName(),
ProcessLogEventTypeEnum.HANGUP,
new HangupData(form.getReason())
- ));
+ ));
return Result.ok("鎿嶄綔鎴愬姛");
}
@@ -731,6 +765,51 @@
return Result.ok("鎿嶄綔鎴愬姛");
}
+ @Override
+ public Result taskTeamwork(TaskTeamWorkForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ if (Objects.isNull(task)) {
+ return Result.error("浠诲姟涓嶅瓨鍦�");
+ }
+ ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
+ .eq(ProjectProcess::getProcessInsId, task.getProcessInstanceId())
+ .eq(ProjectProcess::getProcessDefId, task.getProcessDefinitionId())
+ .one();
+ if (Objects.isNull(projectProcess)) {
+ return Result.error("椤圭洰娴佺▼鏈粦瀹�");
+ }
+ // 1. 淇濆瓨鍙戣捣浜哄～鍐欑殑琛ㄥ崟鏁版嵁锛屼絾涓嶇洿鎺ュ畬鎴愯浠诲姟銆傛彁浜ゅ悗浠诲姟澶勭悊浜哄繀椤荤瓑鍒板崗鍚屼汉澶勭悊瀹屼箣鍚庢墠鑳藉畬鎴愪换鍔�
+ Map<String, Object> processVariables = new HashMap<>();
+ //鏌ュ嚭瀛楀吀涓渶瑕佹敞鍏ョ殑瀛楁淇℃伅
+ List<String> dictList = dictTypeService.selectDictDataByType("flow_variables").stream().map(SysDictData::getDictValue).collect(Collectors.toList());
+ Map<String, Object> newV = new HashMap<>(2);
+ if (!org.springframework.util.CollectionUtils.isEmpty(form.getVariables())) {
+ for (String key : form.getVariables().keySet()) {
+ newV.put(task.getTaskDefinitionKey() + "&" + key, form.getVariables().get(key));
+ //瀛楀吀閲屾湁灏辨斁鍏ユ祦绋嬪彉閲忎腑
+ if (org.apache.commons.collections4.CollectionUtils.isNotEmpty(dictList) && dictList.contains(key)) {
+ processVariables.put(key, form.getVariables().get(key));
+ }
+ }
+ }
+ if (!processVariables.isEmpty()) {
+ taskService.setVariables(form.getTaskId(), processVariables);
+ }
+
+ // 2. 淇濆瓨鏃ュ織
+ publisher.publishEvent(new TaskLogEvent(this,
+ null,
+ SecurityUtils.getUserId(),
+ form.getProjectId(),
+ form.getProcessInsId(),
+ form.getTaskId(),
+ task.getName(),
+ ProcessLogEventTypeEnum.TEAM_WORK,
+ new TeamWorkData(form.getHandlerType(), form.getHandlerIds(), TeamWorkStatusEnum.NOT_FINISHED)
+ ));
+ return Result.ok("鎿嶄綔鎴愬姛");
+ }
+
/**
* 鏌ヨ寰呭姙浠诲姟
*
@@ -750,7 +829,7 @@
.desc();
if (StringUtils.isNotBlank(taskName)) {
- taskQuery.processDefinitionNameLike(taskName);
+ taskQuery.taskNameLike(taskName);
}
result.total(taskQuery.count());
List<Task> taskList = taskQuery.listPage(pageSize * (pageNum - 1), pageSize);
@@ -819,11 +898,16 @@
List<String> handlerNames = new ArrayList<>(2);
List<Long> handlerUnitIds = new ArrayList<>(2);
List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
vo.setHandlerId(handlerIds);
vo.setHandlerName(handlerNames);
vo.setHandlerUnitId(handlerUnitIds);
vo.setHandlerUnitName(handlerUnitNames);
+ vo.setPromoterName(promoterNames);
+ vo.setPromoterUnitName(promoterUnitNames);
+ this.setCandidateInfo(userTask, vo, projectId, processInsId);
if (Objects.isNull(task)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛岄渶瑕佷粠鍘嗗彶浠诲姟涓啀鎵句竴涓�
List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
@@ -834,28 +918,25 @@
.desc()
.list();
if (CollectionUtils.isEmpty(historicTasks)) {
- vo.setPromoterName("鏆傛棤");
- vo.setPromoterUnitName("鏆傛棤");
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
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());
}
}
-
} else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
List<String> groupIds = userTask.getCandidateGroups();
for (String groupId : groupIds) {
// 澶勭悊鍙橀噺琛ㄨ揪寮忥紝DATA_LAUNCH鍙彲鑳芥槸閮ㄩ棬涓嶄細鏄鑹诧紝鍥犱负浠ｈ〃鐨勬槸涓氫富閮ㄩ棬
if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
vo.setHandlerType(HandlerTypeEnum.DEPT);
- this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
+ this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT, 1);
} else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
vo.setHandlerType(HandlerTypeEnum.DEPT);
String[] split = groupId.split(":");
@@ -865,6 +946,7 @@
if (Objects.nonNull(dept)) {
handlerUnitIds.add(dept.getDeptId());
handlerUnitNames.add(dept.getDeptName());
+ handlerNames.add(this.getDeptLeaderShowName(dept));
}
}
} else {
@@ -890,9 +972,11 @@
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
handlerIds.add(handlerUserId);
- handlerNames.add(handlerUser.getNickName());
- vo.setActualHandlerUserId(historicTasks.get(0).getAssignee());
- vo.setActualHandlerUserName(handlerUser.getNickName());
+ handlerNames.add(this.getUserShowName(handlerUser));
+ if (Objects.nonNull(handlerUser.getDept())) {
+ handlerUnitNames.add(handlerUser.getDept().getDeptName());
+ handlerUnitIds.add(handlerUser.getDept().getDeptId());
+ }
}
vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());
this.setPromoterAndHandler(vo, historicTasks.get(0).getIdentityLinks());
@@ -924,6 +1008,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());
@@ -993,18 +1080,19 @@
taskVO.setProcessInsId(task.getProcessInstanceId());
taskVO.setTaskDefinitionKey(task.getTaskDefinitionKey());
- // 娴佺▼鍙戣捣浜轰俊鎭�
- this.setPromoterInfo(taskVO);
-
// 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
List<Long> handlerIds = new ArrayList<>(2);
List<String> handlerNames = new ArrayList<>(2);
List<Long> handlerUnitIds = new ArrayList<>(2);
List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
taskVO.setHandlerId(handlerIds);
taskVO.setHandlerName(handlerNames);
taskVO.setHandlerUnitId(handlerUnitIds);
taskVO.setHandlerUnitName(handlerUnitNames);
+ taskVO.setPromoterName(promoterNames);
+ taskVO.setPromoterUnitName(promoterUnitNames);
// 娴佺▼澶勭悊浜轰俊鎭�
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
@@ -1020,10 +1108,12 @@
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());
+ taskVO.getPromoterName().add(this.getUserShowName(sysUser));
+ taskVO.getPromoterUnitName().add(sysUser.getDept().getDeptName());
}
}
// 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
@@ -1037,6 +1127,8 @@
if (Objects.nonNull(dept)) {
taskVO.getHandlerUnitId().add(dept.getDeptId());
taskVO.getHandlerUnitName().add(dept.getDeptName());
+ taskVO.getPromoterName().add(this.getDeptLeaderShowName(dept));
+ taskVO.getPromoterUnitName().add(dept.getDeptName());
}
}
} else {
@@ -1048,7 +1140,6 @@
}
}
}
-
this.distinctVo(taskVO);
}
}
@@ -1107,7 +1198,7 @@
* @param result
* @return
*/
- private List<CustomerTaskVO> getTimelyTask(String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
+ private List<CustomerTaskVO> getTimelyTask(Long projectId, String processDefinitionId, String processInsId, String taskName, Integer pageNum, Integer pageSize, Result result) {
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
@@ -1190,11 +1281,16 @@
List<String> handlerNames = new ArrayList<>(2);
List<Long> handlerUnitIds = new ArrayList<>(2);
List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
vo.setHandlerId(handlerIds);
vo.setHandlerName(handlerNames);
vo.setHandlerUnitId(handlerUnitIds);
vo.setHandlerUnitName(handlerUnitNames);
+ vo.setPromoterName(promoterNames);
+ vo.setPromoterUnitName(promoterUnitNames);
+ this.setCandidateInfo(userTask, vo, projectId, processInsId);
HistoricTaskInstance hisTask = keyMap.get(userTask.getId());
if (Objects.nonNull(hisTask)) {
vo.setTaskStatus(TaskStatusEnum.FINISHED);
@@ -1208,9 +1304,7 @@
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
vo.getHandlerId().add(handlerUserId);
- vo.getHandlerName().add(handlerUser.getNickName());
- vo.setActualHandlerUserId(hisTask.getAssignee());
- vo.setActualHandlerUserName(handlerUser.getNickName());
+ vo.getHandlerName().add(this.getUserShowName(handlerUser));
}
vo.setTaskDefinitionKey(hisTask.getTaskDefinitionKey());
this.setPromoterAndHandler(vo, hisTask.getIdentityLinks());
@@ -1221,6 +1315,26 @@
}).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() + ")" : "");
+ }
+
+ /**
+ * 閮ㄩ棬璐熻矗浜哄悕绉板悗闈㈣窡鐢佃瘽鍙风爜
+ *
+ * @param dept
+ * @return
+ */
+ private String getDeptLeaderShowName(SysDept dept) {
+ return dept.getLeader() + (StringUtils.isNotBlank(dept.getPhone()) ? "(" + dept.getPhone() + ")" : "");
}
/**
@@ -1530,10 +1644,14 @@
List<String> handlerNames = new ArrayList<>(2);
List<Long> handlerUnitIds = new ArrayList<>(2);
List<String> handlerUnitNames = new ArrayList<>(2);
+ List<String> promoterNames = new ArrayList<>(2);
+ List<String> promoterUnitNames = new ArrayList<>(2);
vo.setHandlerId(handlerIds);
vo.setHandlerName(handlerNames);
vo.setHandlerUnitId(handlerUnitIds);
vo.setHandlerUnitName(handlerUnitNames);
+ vo.setPromoterName(promoterNames);
+ vo.setPromoterUnitName(promoterUnitNames);
vo.setProcessInsId(process.getId());
vo.setProcessDefId(processDefinitionId);
@@ -1541,6 +1659,9 @@
vo.setTaskName(userTask.getName());
vo.setProcessName(process.getProcessDefinitionName());
vo.setTaskStatus(TaskStatusEnum.NOT_START);
+
+ this.setCandidateInfo(userTask, vo, projectId, processInsId);
+
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
@@ -1559,7 +1680,7 @@
// 澶勭悊鍙橀噺琛ㄨ揪寮忥紝DATA_LAUNCH鍙彲鑳芥槸閮ㄩ棬涓嶄細鏄鑹诧紝鍥犱负浠ｈ〃鐨勬槸涓氫富閮ㄩ棬
if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
vo.setHandlerType(HandlerTypeEnum.DEPT);
- this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
+ this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT, 1);
} else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
vo.setHandlerType(HandlerTypeEnum.DEPT);
String[] split = groupId.split(":");
@@ -1602,10 +1723,10 @@
/**
* 澶勭悊娴佺▼鍙橀噺-涓氫富鍗曚綅
- *
+ * @param setType 0 璁剧疆璐ｄ换鍗曚綅 1 璁剧疆鍔炵悊鍗曚綅
* @param vo
*/
- private void varYzReview(CustomerTaskVO vo, Long projectId, String processInsId, HandlerTypeEnum type) {
+ private void varYzReview(CustomerTaskVO vo, Long projectId, String processInsId, HandlerTypeEnum type, Integer setType) {
ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
.eq(ProjectProcess::getProjectId, projectId)
.eq(ProjectProcess::getProcessInsId, processInsId)
@@ -1622,8 +1743,14 @@
} else if (HandlerTypeEnum.DEPT.equals(type)) {
SysDept dept = deptService.selectDeptById(projectProcess.getDataLaunch());
if (Objects.nonNull(dept)) {
- vo.getHandlerUnitId().add(dept.getDeptId());
- vo.getHandlerUnitName().add(dept.getDeptName());
+ if (setType == 1) {
+ vo.getHandlerUnitId().add(dept.getDeptId());
+ vo.getHandlerUnitName().add(dept.getDeptName());
+ vo.getHandlerName().add(this.getDeptLeaderShowName(dept));
+ } else {
+ vo.getPromoterUnitName().add(dept.getDeptName());
+ vo.getPromoterName().add(this.getDeptLeaderShowName(dept));
+ }
}
} else if (HandlerTypeEnum.ROLE.equals(type)) {
SysRole role = sysRoleService.selectRoleById(projectProcess.getDataLaunch());
@@ -1661,6 +1788,52 @@
return totalNum - num;
}
+ /**
+ * 璁剧疆鍊欓�変汉淇℃伅/璐ｄ换鍗曚綅
+ *
+ * @param userTask
+ * @param vo
+ * @param projectId
+ * @param processInsId
+ */
+ private void setCandidateInfo(UserTask userTask, CustomerTaskVO vo, Long projectId, String processInsId) {
+ if (StringUtils.isNotBlank(userTask.getAssignee())) {
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
+ if (Objects.nonNull(sysUser)) {
+ if (Objects.nonNull(sysUser.getDept())) {
+ // 濡傛灉鏄寚瀹氱殑鏌愪釜浜猴紝閭ｄ箞璐ｄ换鍗曚綅鏄繖涓汉鎵�鍦ㄧ殑閮ㄩ棬
+ vo.getPromoterUnitName().add(sysUser.getDept().getDeptName());
+ vo.getPromoterName().add(this.getUserShowName(sysUser));
+ }
+ }
+ } else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
+ List<String> groupIds = userTask.getCandidateGroups();
+ for (String groupId : groupIds) {
+ // 澶勭悊鍙橀噺琛ㄨ揪寮忥紝DATA_LAUNCH鍙彲鑳芥槸閮ㄩ棬涓嶄細鏄鑹诧紝鍥犱负浠ｈ〃鐨勬槸涓氫富閮ㄩ棬
+ if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
+ vo.setHandlerType(HandlerTypeEnum.DEPT);
+ this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT, 0);
+ } else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ vo.setHandlerType(HandlerTypeEnum.DEPT);
+ String[] split = groupId.split(":");
+ if (split.length > 1) {
+ // 閮ㄩ棬
+ SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
+ if (Objects.nonNull(dept)) {
+ vo.getPromoterUnitName().add(dept.getDeptName());
+ vo.getPromoterName().add(this.getDeptLeaderShowName(dept));
+ }
+ }
+ } else {
+ vo.setHandlerType(HandlerTypeEnum.ROLE);
+ SysRole role = sysRoleService.selectRoleById(Long.parseLong(groupId));
+ if (Objects.nonNull(role)) {
+ vo.getPromoterUnitName().add(role.getRoleName());
+ }
+ }
+ }
+ }
+ }
/**
* 璁剧疆浠诲姟鐨勫彂璧蜂汉&澶勭悊浜� 鍙湁寰呭姙浠诲姟鍜屽凡瀹屾垚浠诲姟鎵嶄細鎺夎繖涓柟娉�
@@ -1669,7 +1842,7 @@
* @param identityLinkInfos 濡傛灉鏄凡瀹屾垚鐨勪换鍔★紝鐢ㄨ繖涓幓鍙栧叧鑱旂殑鐢ㄦ埛/鐢ㄦ埛缁�
*/
private void setPromoterAndHandler(CustomerTaskVO taskVO, List<? extends IdentityLinkInfo> identityLinkInfos) {
- this.setPromoterInfo(taskVO);
+// this.setPromoterInfo(taskVO);
// 涓�涓换鍔″彲鑳芥湁澶氫釜鍊欓�変汉/缁勶紝鎵�浠ラ渶瑕佷娇鐢╨ist
List<Long> handlerIds = new ArrayList<>(2);
@@ -1694,7 +1867,7 @@
if (Objects.nonNull(sysUser)) {
taskVO.setHandlerType(HandlerTypeEnum.USER);
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());
@@ -1731,7 +1904,7 @@
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
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());
@@ -1761,7 +1934,6 @@
}
}
}
-
this.distinctVo(taskVO);
}
@@ -1771,41 +1943,41 @@
* @param taskVO
*/
private void setPromoterInfo(CustomerTaskVO taskVO) {
- // 鍙戣捣浜哄簲涓轰笂涓�鑺傜偣鐨勫鐞嗕汉
- List<String> beforeNodeKey = taskCommonService.getBeforeNodeInfo(taskVO.getProcessDefId(), taskVO.getTaskDefinitionKey());
- List<SysUser> userList = beforeNodeKey.stream().map(key -> {
- List<HistoricTaskInstance> historicTaskInstances = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(taskVO.getProcessInsId())
- .taskDefinitionKey(key)
- .orderByHistoricTaskInstanceStartTime()
- .desc()
- .list(); // 涔嬫墍浠ョ敤list鏄洜涓哄鏋滄煇涓换鍔¤椹冲洖杩囷紝涓斿鏋滆浠诲姟鍐嶆鎵ц鏃朵細鏈夊鏉℃暟鎹紝鍙栨渶鏂扮殑涓�鏉�
- if (!CollectionUtils.isEmpty(historicTaskInstances)) {
- // 瀹為檯棰嗗彇杩欎釜浠诲姟鐨勪汉锛屼篃灏辨槸澶勭悊浜�
- String assignee = historicTaskInstances.get(0).getAssignee();
- SysUser startUser = sysUserService.selectUserById(Long.parseLong(assignee));
- return startUser;
- } else {
- return null;
- }
- }).filter(user -> Objects.nonNull(user)).collect(Collectors.toList());
- if (CollectionUtils.isEmpty(userList)) {
- taskVO.setPromoterName("鏆傛棤");
- taskVO.setPromoterUnitName("鏆傛棤");
- } else {
- taskVO.setPromoterId(userList.stream().map(user -> {
- return user.getUserId() + "";
- }).collect(Collectors.joining("銆�")));
- taskVO.setPromoterName(userList.stream().map(user -> {
- return user.getNickName();
- }).collect(Collectors.joining("銆�")));
- taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
- return user.getDept().getDeptId() + "";
- }).collect(Collectors.joining("銆�")));
- taskVO.setPromoterUnitName(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
- return user.getDept().getDeptName() + "";
- }).collect(Collectors.joining("銆�")));
- }
+// // 鍙戣捣浜哄簲涓轰笂涓�鑺傜偣鐨勫鐞嗕汉
+// List<String> beforeNodeKey = taskCommonService.getBeforeNodeInfo(taskVO.getProcessDefId(), taskVO.getTaskDefinitionKey());
+// List<SysUser> userList = beforeNodeKey.stream().map(key -> {
+// List<HistoricTaskInstance> historicTaskInstances = historyService.createHistoricTaskInstanceQuery()
+// .processInstanceId(taskVO.getProcessInsId())
+// .taskDefinitionKey(key)
+// .orderByHistoricTaskInstanceStartTime()
+// .desc()
+// .list(); // 涔嬫墍浠ョ敤list鏄洜涓哄鏋滄煇涓换鍔¤椹冲洖杩囷紝涓斿鏋滆浠诲姟鍐嶆鎵ц鏃朵細鏈夊鏉℃暟鎹紝鍙栨渶鏂扮殑涓�鏉�
+// if (!CollectionUtils.isEmpty(historicTaskInstances)) {
+// // 瀹為檯棰嗗彇杩欎釜浠诲姟鐨勪汉锛屼篃灏辨槸澶勭悊浜�
+// String assignee = historicTaskInstances.get(0).getAssignee();
+// SysUser startUser = sysUserService.selectUserById(Long.parseLong(assignee));
+// return startUser;
+// } else {
+// return null;
+// }
+// }).filter(user -> Objects.nonNull(user)).collect(Collectors.toList());
+// if (CollectionUtils.isEmpty(userList)) {
+// taskVO.setPromoterName("鏆傛棤");
+// taskVO.setPromoterUnitName("鏆傛棤");
+// } else {
+// taskVO.setPromoterId(userList.stream().map(user -> {
+// return user.getUserId() + "";
+// }).collect(Collectors.joining("銆�")));
+// taskVO.setPromoterName(userList.stream().map(user -> {
+// return this.getUserShowName(user);
+// }).collect(Collectors.joining("銆�")));
+// taskVO.setPromoterUnitId(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
+// return user.getDept().getDeptId() + "";
+// }).collect(Collectors.joining("銆�")));
+// taskVO.setPromoterUnitName(userList.stream().filter(user -> Objects.nonNull(user.getDept())).map(user -> {
+// return user.getDept().getDeptName() + "";
+// }).collect(Collectors.joining("銆�")));
+// }
}
/**
--
Gitblit v1.8.0