From e4ee26d6e5da074c5a682bed33d193974297537c Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期五, 13 十二月 2024 17:55:44 +0800
Subject: [PATCH] bug修改、任务驳回功能基础实现
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 55 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 37 insertions(+), 18 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 71e3bcc..46d7ee4 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -19,6 +19,7 @@
import com.ycl.domain.dto.FlowTaskDto;
import com.ycl.domain.entity.ProjectInfo;
import com.ycl.domain.entity.ProjectProcess;
+import com.ycl.domain.form.RejectTaskForm;
import com.ycl.domain.vo.CustomerTaskVO;
import com.ycl.domain.vo.ProjectProcessDetailVO;
import com.ycl.mapper.ProjectInfoMapper;
@@ -358,6 +359,13 @@
return Result.ok().data(needAuditing);
}
+ @Override
+ public Result rejectTask(RejectTaskForm form) {
+ Task task = taskService.createTaskQuery().taskId(form.getTaskId()).singleResult();
+ taskCommonService.reject(form.getRejectedTaskDefKey(), task.getTaskDefinitionKey(), task.getProcessInstanceId(), form.getTaskId(), form.getAuditOpinion());
+ return Result.ok("椹冲洖鎴愬姛");
+ }
+
/**
* 鏌ヨ寰呭姙浠诲姟
*
@@ -486,12 +494,14 @@
Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
if (Objects.isNull(task)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛岄渶瑕佷粠鍘嗗彶浠诲姟涓啀鎵句竴涓�
- HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(process.getProcessInstanceId())
.taskDefinitionKey(userTask.getId())
.includeIdentityLinks()
- .singleResult();
- if (Objects.isNull(historicTask)) {
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(historicTasks)) {
vo.setPromoterName("鏆傛棤");
vo.setPromoterUnitName("鏆傛棤");
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
@@ -534,18 +544,18 @@
} else {
vo.setTaskStatus(TaskStatusEnum.FINISHED);
// 濡傛灉鏄凡瀹屾垚鐨勶紝淇℃伅闇�瑕佸崟鐙祴鍊�
- vo.setTaskId(historicTask.getId());
- vo.setExecutionId(historicTask.getExecutionId());
- vo.setCreateTime(historicTask.getStartTime());
+ vo.setTaskId(historicTasks.get(0).getId());
+ vo.setExecutionId(historicTasks.get(0).getExecutionId());
+ vo.setCreateTime(historicTasks.get(0).getStartTime());
// 鏌ヨ瀹為檯澶勭悊浜�
- long handlerUserId = Long.parseLong(historicTask.getAssignee());
+ long handlerUserId = Long.parseLong(historicTasks.get(0).getAssignee());
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
vo.setHandlerId(handlerUserId);
vo.setHandlerName(handlerUser.getNickName());
}
- vo.setTaskDefinitionKey(historicTask.getTaskDefinitionKey());
- this.setPromoterAndHandler(vo, historicTask.getIdentityLinks());
+ vo.setTaskDefinitionKey(historicTasks.get(0).getTaskDefinitionKey());
+ this.setPromoterAndHandler(vo, historicTasks.get(0).getIdentityLinks());
}
} else {
vo.setTaskStatus(TaskStatusEnum.TODO);
@@ -602,12 +612,14 @@
Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
if (Objects.isNull(task)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛屽彧鏌ヨ鏈紑濮嬬殑
- HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(process.getProcessInstanceId())
.taskDefinitionKey(userTask.getId())
.includeIdentityLinks()
- .singleResult();
- if (Objects.isNull(historicTask)) {
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(historicTasks)) {
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
@@ -675,12 +687,14 @@
Task task = taskService.createTaskQuery().processInstanceId(process.getId()).taskDefinitionKey(userTask.getId()).singleResult();
if (Objects.isNull(task)) {
// 濡傛灉浠诲姟鍦ㄨ繍琛屾椂娌℃壘鍒帮紝閭ｄ箞鍙兘涓烘湭寮�濮嬫垨鑰呭凡瀹屾垚锛屽彧鏌ヨ鏈紑濮嬬殑
- HistoricTaskInstance historicTask = historyService.createHistoricTaskInstanceQuery()
+ List<HistoricTaskInstance> historicTasks = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(process.getProcessInstanceId())
.taskDefinitionKey(userTask.getId())
.includeIdentityLinks()
- .singleResult();
- if (Objects.isNull(historicTask)) {
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(historicTasks)) {
num++;
}
}
@@ -792,10 +806,15 @@
// 鍙戣捣浜哄簲涓轰笂涓�鑺傜偣鐨勫鐞嗕汉
List<String> beforeNodeKey = taskCommonService.getBeforeNodeInfo(taskVO.getProcessDefId(), taskVO.getTaskDefinitionKey());
List<SysUser> userList = beforeNodeKey.stream().map(key -> {
- HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery().taskDefinitionKey(key).singleResult();
- if (Objects.nonNull(historicTaskInstance)) {
+ List<HistoricTaskInstance> historicTaskInstances = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(taskVO.getProcessInsId())
+ .taskDefinitionKey(key)
+ .orderByHistoricTaskInstanceStartTime()
+ .desc()
+ .list(); // 涔嬫墍浠ョ敤list鏄洜涓哄鏋滄煇涓换鍔¤椹冲洖杩囷紝涓斿鏋滆浠诲姟鍐嶆鎵ц鏃朵細鏈夊鏉℃暟鎹紝鍙栨渶鏂扮殑涓�鏉�
+ if (! CollectionUtils.isEmpty(historicTaskInstances)) {
// 瀹為檯棰嗗彇杩欎釜浠诲姟鐨勪汉锛屼篃灏辨槸澶勭悊浜�
- String assignee = historicTaskInstance.getAssignee();
+ String assignee = historicTaskInstances.get(0).getAssignee();
SysUser startUser = sysUserService.selectUserById(Long.parseLong(assignee));
return startUser;
} else {
--
Gitblit v1.8.0