From be8f5982d0a2ccfc2880a3356e9cfe816affe9ef Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 11 二月 2025 17:58:17 +0800
Subject: [PATCH] 主管部门sqlbug
---
business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java | 396 +++++++++++++++++++++++++++++++++-----------------------
1 files changed, 232 insertions(+), 164 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 68e9f43..4dedffa 100644
--- a/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
+++ b/business/src/main/java/com/ycl/service/impl/ProjectProcessServiceImpl.java
@@ -159,6 +159,7 @@
.set(ProjectProcess::getProcessInsId, processInsId)
.set(ProjectProcess::getDataLaunch, project.getCreateBy())
.update();
+
return Result.ok("娴佺▼鍙樻洿鎴愬姛");
}
@@ -207,9 +208,10 @@
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, createBy);
+ variables.put(ProcessConstants.DATA_LAUNCH, "dept:" + createBy);
ProcessInstance processInstance = runtimeService.startProcessInstanceById(processDefId, projectId + "", variables);
return processInstance.getId();
}
@@ -649,7 +651,8 @@
.active()
.processInstanceId(processInsId)
.includeProcessVariables()
- .orderByTaskCreateTime().desc();
+ .orderByTaskCreateTime()
+ .desc();
if (StringUtils.isNotBlank(taskName)) {
taskQuery.processDefinitionNameLike(taskName);
@@ -737,24 +740,25 @@
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
- // 澶勭悊鍙橀噺琛ㄨ揪寮�
- if (userTask.getAssignee().contains(ProcessConstants.DATA_LAUNCH)) {
- this.varReview(vo, projectId, processInsId);
- } else {
- SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
- if (Objects.nonNull(sysUser)) {
- handlerIds.add(sysUser.getUserId());
- handlerNames.add(sysUser.getNickName());
- if (Objects.nonNull(sysUser.getDept())) {
- handlerUnitIds.add(sysUser.getDept().getDeptId());
- handlerUnitNames.add(sysUser.getDept().getDeptName());
- }
+ SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
+ if (Objects.nonNull(sysUser)) {
+ handlerIds.add(sysUser.getUserId());
+ handlerNames.add(sysUser.getNickName());
+ 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) {
- if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ // 澶勭悊鍙橀噺琛ㄨ揪寮忥紝DATA_LAUNCH鍙彲鑳芥槸閮ㄩ棬涓嶄細鏄鑹诧紝鍥犱负浠ｈ〃鐨勬槸涓氫富閮ㄩ棬
+ if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
+ vo.setHandlerType(HandlerTypeEnum.DEPT);
+ this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
+ }
+ else if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
vo.setHandlerType(HandlerTypeEnum.DEPT);
String[] split = groupId.split(":");
if (split.length > 1) {
@@ -763,7 +767,6 @@
if (Objects.nonNull(dept)) {
handlerUnitIds.add(dept.getDeptId());
handlerUnitNames.add(dept.getDeptName());
-
}
}
} else {
@@ -908,24 +911,21 @@
// 娴佺▼澶勭悊浜轰俊鎭�
List<IdentityLink> identityLinksForTask = taskService.getIdentityLinksForTask(task.getId());
for (IdentityLinkInfo identityLink : identityLinksForTask) {
-// if (StringUtils.isBlank(((IdentityLinkEntityImpl)identityLink).getId())) {
-// continue;
-// }
// 缁戝畾鐨勬槸鐢ㄦ埛锛屾煡鍑虹敤鎴峰鍚嶃�侀儴闂�
if (StringUtils.isNotBlank(identityLink.getUserId())) {
- // 澶勭悊鍙橀噺琛ㄨ揪寮�
- if (identityLink.getUserId().contains(ProcessConstants.DATA_LAUNCH)) {
- this.varReview(taskVO, projectId, task.getProcessInstanceId());
- continue;
- }
+ // 澶勭悊鍙橀噺琛ㄨ揪寮忥紝杩愯涓殑浠诲姟鏃犻渶鍐嶅鐞嗚〃杈惧紡浜嗭紝flowable宸茬粡鑷姩鏍规嵁鍙橀噺璁剧疆浜�
+// if (identityLink.getUserId().contains(ProcessConstants.DATA_LAUNCH)) {
+// this.varReview(taskVO, projectId, task.getProcessInstanceId());
+// continue;
+// }
taskVO.setHandlerType(HandlerTypeEnum.USER);
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(identityLink.getUserId()));
if (Objects.nonNull(sysUser)) {
- handlerIds.add(sysUser.getUserId());
- handlerNames.add(sysUser.getNickName());
+ taskVO.getHandlerId().add(sysUser.getUserId());
+ taskVO.getHandlerName().add(sysUser.getNickName());
if (Objects.nonNull(sysUser.getDept())) {
- handlerUnitIds.add(sysUser.getDept().getDeptId());
- handlerUnitNames.add(sysUser.getDept().getDeptName());
+ taskVO.getHandlerUnitId().add(sysUser.getDept().getDeptId());
+ taskVO.getHandlerUnitName().add(sysUser.getDept().getDeptName());
}
}
// 缁戝畾鐨勬槸瑙掕壊鎴栬�呴儴闂�
@@ -937,16 +937,16 @@
// 閮ㄩ棬
SysDept dept = sysDeptService.selectDeptById(Long.parseLong(split[1]));
if (Objects.nonNull(dept)) {
- handlerUnitIds.add(dept.getDeptId());
- handlerUnitNames.add(dept.getDeptName());
+ taskVO.getHandlerUnitId().add(dept.getDeptId());
+ taskVO.getHandlerUnitName().add(dept.getDeptName());
}
}
} else {
taskVO.setHandlerType(HandlerTypeEnum.ROLE);
SysRole role = sysRoleService.selectRoleById(Long.parseLong(identityLink.getGroupId()));
if (Objects.nonNull(role)) {
- handlerUnitIds.add(Long.parseLong(identityLink.getGroupId()));
- handlerUnitNames.add(role.getRoleName());
+ taskVO.getHandlerUnitId().add(Long.parseLong(identityLink.getGroupId()));
+ taskVO.getHandlerUnitName().add(role.getRoleName());
}
}
}
@@ -962,24 +962,36 @@
* @return
*/
private Long getTimelyTaskNum(String processInsId) {
- // 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔d
- List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .select(ProcessCoding::getTaskDefKey)
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.NORMAL)
- .list()
- .stream()
- .map(ProcessCoding::getTaskDefKey)
- .collect(Collectors.toList());
- if (CollectionUtils.isEmpty(taskKeyList)) {
- return 0L;
- }
- // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
- return historyService.createHistoricTaskInstanceQuery()
+ // 鏌ュ嚭宸插畬鎴愮殑浠诲姟key
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
.processInstanceId(processInsId)
.finished()
- .caseDefinitionKeyIn(taskKeyList)
- .count();
+ .includeIdentityLinks()
+ .list();
+ if (CollectionUtils.isEmpty(hisTaskList)) {
+ return 0L;
+ }
+
+ List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
+ // 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
+ List<ProcessCoding> taskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .in(ProcessCoding::getTaskDefKey, hisTaskKeys)
+ .list();
+ Map<String, ProcessCoding> codingMap = taskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
+ List<HistoricTaskInstance> finishedTaskList = new ArrayList<>();
+ // 鍒ゆ柇
+ for (String key : hisTaskMap.keySet()) {
+ ProcessCoding processCoding = codingMap.get(key);
+ // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
+ if (Objects.isNull(processCoding)) {
+ finishedTaskList.add(hisTaskMap.get(key));
+ } else if (ProcessOverTimeConstants.NORMAL.equals(processCoding.getOvertimeStatus()) || StringUtils.isBlank(processCoding.getOvertimeStatus())) {
+ finishedTaskList.add(hisTaskMap.get(key));
+ }
+ }
+ return Long.valueOf(finishedTaskList.size());
}
/**
@@ -997,26 +1009,38 @@
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
- // 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔d
- List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .select(ProcessCoding::getTaskDefKey)
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.NORMAL)
- .list()
- .stream()
- .map(ProcessCoding::getTaskDefKey)
- .collect(Collectors.toList());
+ // 鏌ュ嚭宸插畬鎴愮殑浠诲姟key
+ List<HistoricTaskInstance> hisTaskList = historyService.createHistoricTaskInstanceQuery()
+ .processInstanceId(processInsId)
+ .finished()
+ .taskNameLike(taskName)
+ .includeIdentityLinks()
+ .orderByTaskCreateTime()
+ .desc()
+ .list();
+ if (CollectionUtils.isEmpty(hisTaskList)) {
+ result.total(0);
+ return new ArrayList<>();
+ }
+ List<String> hisTaskKeys = hisTaskList.stream().map(HistoricTaskInstance::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ Map<String, HistoricTaskInstance> hisTaskMap = hisTaskList.stream().collect(Collectors.toMap(HistoricTaskInstance::getTaskDefinitionKey, his -> his));
+ // 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔ey
+ List<ProcessCoding> taskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .in(ProcessCoding::getTaskDefKey, hisTaskKeys)
+ .list();
+ Map<String, ProcessCoding> codingMap = taskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
List<HistoricTaskInstance> finishedTaskList = new ArrayList<>();
- if (! CollectionUtils.isEmpty(taskKeyList)) {
- // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
- finishedTaskList = historyService.createHistoricTaskInstanceQuery()
- .processInstanceId(processInsId)
- .finished()
- .taskNameLike(taskName)
- .caseDefinitionKeyIn(taskKeyList)
- .includeIdentityLinks()
- .list();
+ // 鍒ゆ柇
+ for (String key : hisTaskMap.keySet()) {
+ ProcessCoding processCoding = codingMap.get(key);
+ // 濡傛灉宸插畬鎴愮殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝鐩存帴璁剧疆涓烘寜鏃跺畬鎴�
+ if (Objects.isNull(processCoding)) {
+ finishedTaskList.add(hisTaskMap.get(key));
+ } else if (ProcessOverTimeConstants.NORMAL.equals(processCoding.getOvertimeStatus()) || StringUtils.isBlank(processCoding.getOvertimeStatus())) {
+ finishedTaskList.add(hisTaskMap.get(key));
+ }
}
if (startNum >= finishedTaskList.size()) {
@@ -1077,8 +1101,8 @@
long handlerUserId = Long.parseLong(hisTask.getAssignee());
SysUser handlerUser = sysUserService.selectUserById(handlerUserId);
if (Objects.nonNull(handlerUser)) {
- handlerIds.add(handlerUserId);
- handlerNames.add(handlerUser.getNickName());
+ vo.getHandlerId().add(handlerUserId);
+ vo.getHandlerName().add(handlerUser.getNickName());
vo.setActualHandlerUserId(hisTask.getAssignee());
vo.setActualHandlerUserName(handlerUser.getNickName());
}
@@ -1101,23 +1125,31 @@
* @return
*/
private Long getOvertimeTaskNum(String processInsId) {
- // 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔d
- List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .select(ProcessCoding::getTaskDefKey)
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
- .list()
- .stream()
- .map(ProcessCoding::getTaskDefKey)
- .collect(Collectors.toList());
- if (CollectionUtils.isEmpty(taskKeyList)) {
+ // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
+ List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInsId).list();
+
+ if (CollectionUtils.isEmpty(taskList)) {
return 0L;
}
- // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
- return taskService.createTaskQuery()
- .processInstanceId(processInsId)
- .caseDefinitionKeyIn(taskKeyList)
- .count();
+ List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+ // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
+ List<ProcessCoding> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .in(ProcessCoding::getTaskDefKey, taskKeys)
+ .list();
+ Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
+ List<Task> tList = new ArrayList<>();
+ // 鍒ゆ柇
+ for (String key : taskMap.keySet()) {
+ ProcessCoding processCoding = codingMap.get(key);
+ // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻瓒呮椂
+ if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.OVERTIME.equals(processCoding.getOvertimeStatus())) {
+ tList.add(taskMap.get(key));
+ }
+ }
+
+ return Long.valueOf(taskList.size());
}
/**
@@ -1136,33 +1168,42 @@
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
- // 鏌ュ嚭鍗冲皢瓒呮椂鐨勪换鍔�
- List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .select(ProcessCoding::getTaskDefKey)
+ // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
+ List<Task> taskList = new ArrayList<>(12);
+ if (StringUtils.isNotBlank(taskName)) {
+ taskList = taskService.createTaskQuery().processInstanceId(processInsId).taskNameLike(taskName).orderByTaskCreateTime().desc().list();
+ } else {
+ taskList = taskService.createTaskQuery().processInstanceId(processInsId).orderByTaskCreateTime().desc().list();
+ }
+ if (CollectionUtils.isEmpty(taskList)) {
+ result.total(0);
+ return new ArrayList<>();
+ }
+ List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+ // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
+ List<ProcessCoding> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
- .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.OVERTIME)
- .list()
- .stream()
- .map(ProcessCoding::getTaskDefKey)
- .collect(Collectors.toList());
-
- List<Task> taskList = new ArrayList<>();
- // 鏌ュ嚭鎵�鏈夋鍦ㄥ鐞�(杩愯鏃�)鐨勪换鍔�
- if (! CollectionUtils.isEmpty(taskKeyList)) {
- taskList = taskService.createTaskQuery()
- .processInstanceId(processInsId)
- .taskNameLike(taskName)
- .caseDefinitionKeyIn(taskKeyList)
- .list();
+ .in(ProcessCoding::getTaskDefKey, taskKeys)
+ .list();
+ Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
+ List<Task> tList = new ArrayList<>();
+ // 鍒ゆ柇
+ for (String key : taskMap.keySet()) {
+ ProcessCoding processCoding = codingMap.get(key);
+ // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻瓒呮椂
+ if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.OVERTIME.equals(processCoding.getOvertimeStatus())) {
+ tList.add(taskMap.get(key));
+ }
}
- if (startNum >= taskList.size()) {
+ if (startNum >= tList.size()) {
// 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
return new ArrayList<>();
}
- result.total(taskList.size());
- int end = Math.min(endNum, taskList.size());
- List<Task> pageTaskList = taskList.subList(startNum, end);
+ result.total(tList.size());
+ int end = Math.min(endNum, tList.size());
+ List<Task> pageTaskList = tList.subList(startNum, end);
List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
@@ -1187,23 +1228,29 @@
* @return
*/
private Long getWillOvertimeTaskNum(String processInsId) {
- // 鏌ュ嚭鏃堕棿姝ｅ父鐨勪换鍔d
- List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .select(ProcessCoding::getTaskDefKey)
- .eq(ProcessCoding::getProcessInsId, processInsId)
- .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.WILLOVERTIME)
- .list()
- .stream()
- .map(ProcessCoding::getTaskDefKey)
- .collect(Collectors.toList());
- if (CollectionUtils.isEmpty(taskKeyList)) {
+ // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
+ List<Task> taskList = taskService.createTaskQuery().processInstanceId(processInsId).list();
+ if (CollectionUtils.isEmpty(taskList)) {
return 0L;
}
- // 鏌ュ嚭鎵�鏈夊凡瀹屾垚鐨勪换鍔�
- return taskService.createTaskQuery()
- .processInstanceId(processInsId)
- .caseDefinitionKeyIn(taskKeyList)
- .count();
+ List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+ // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
+ List<ProcessCoding> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
+ .eq(ProcessCoding::getProcessInsId, processInsId)
+ .in(ProcessCoding::getTaskDefKey, taskKeys)
+ .list();
+ Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
+ List<Task> tList = new ArrayList<>();
+ // 鍒ゆ柇
+ for (String key : taskMap.keySet()) {
+ ProcessCoding processCoding = codingMap.get(key);
+ // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻鍗冲皢瓒呮椂
+ if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.WILLOVERTIME.equals(processCoding.getOvertimeStatus())) {
+ tList.add(taskMap.get(key));
+ }
+ }
+ return Long.valueOf(tList.size());
}
/**
@@ -1222,33 +1269,42 @@
int startNum = pageSize * (pageNum - 1);
int endNum = startNum + pageSize;
- // 鏌ュ嚭鍗冲皢瓒呮椂鐨勪换鍔�
- List<String> taskKeyList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
- .select(ProcessCoding::getTaskDefKey)
+ // 鏌ュ嚭杩愯鍦ㄧ殑浠诲姟key
+ List<Task> taskList = new ArrayList<>(12);
+ if (StringUtils.isNotBlank(taskName)) {
+ taskList = taskService.createTaskQuery().processInstanceId(processInsId).taskNameLike(taskName).orderByTaskCreateTime().desc().list();
+ } else {
+ taskList = taskService.createTaskQuery().processInstanceId(processInsId).orderByTaskCreateTime().desc().list();
+ }
+ if (CollectionUtils.isEmpty(taskList)) {
+ result.total(0);
+ return new ArrayList<>();
+ }
+ List<String> taskKeys = taskList.stream().map(Task::getTaskDefinitionKey).distinct().collect(Collectors.toList());
+ Map<String, Task> taskMap = taskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
+ // 鏌ュ嚭鏁版嵁搴撶殑浠诲姟key
+ List<ProcessCoding> databaseTaskList = new LambdaQueryChainWrapper<>(processCodingService.getBaseMapper())
.eq(ProcessCoding::getProcessInsId, processInsId)
- .eq(ProcessCoding::getOvertimeStatus, ProcessOverTimeConstants.WILLOVERTIME)
- .list()
- .stream()
- .map(ProcessCoding::getTaskDefKey)
- .collect(Collectors.toList());
-
- List<Task> taskList = new ArrayList<>();
- // 鏌ュ嚭鎵�鏈夋鍦ㄥ鐞�(杩愯鏃�)鐨勪换鍔�
- if (! CollectionUtils.isEmpty(taskKeyList)) {
- taskList = taskService.createTaskQuery()
- .processInstanceId(processInsId)
- .taskNameLike(taskName)
- .caseDefinitionKeyIn(taskKeyList)
- .list();
+ .in(ProcessCoding::getTaskDefKey, taskKeys)
+ .list();
+ Map<String, ProcessCoding> codingMap = databaseTaskList.stream().collect(Collectors.toMap(ProcessCoding::getTaskDefKey, pro -> pro));
+ List<Task> tList = new ArrayList<>();
+ // 鍒ゆ柇
+ for (String key : taskMap.keySet()) {
+ ProcessCoding processCoding = codingMap.get(key);
+ // 濡傛灉杩愯涓殑浠诲姟娌′粠鏁版嵁搴撴煡鎵惧嚭鏉ワ紝璇存槑璇ヤ换鍔℃病閰嶇疆璧嬬爜绛夋椂闂达紝涓嶇畻鍗冲皢瓒呮椂
+ if (Objects.nonNull(processCoding) && ProcessOverTimeConstants.WILLOVERTIME.equals(processCoding.getOvertimeStatus())) {
+ tList.add(taskMap.get(key));
+ }
}
- if (startNum >= taskList.size()) {
+ if (startNum >= tList.size()) {
// 濡傛灉璧峰绱㈠紩瓒呭嚭浜嗗垪琛ㄧ殑澶у皬锛岃繑鍥炰竴涓┖鍒楄〃
return new ArrayList<>();
}
- result.total(taskList.size());
- int end = Math.min(endNum, taskList.size());
- List<Task> pageTaskList = taskList.subList(startNum, end);
+ result.total(tList.size());
+ int end = Math.min(endNum, tList.size());
+ List<Task> pageTaskList = tList.subList(startNum, end);
List<String> taskDefs = pageTaskList.stream().map(Task::getTaskDefinitionKey).collect(Collectors.toList());
Map<String, Task> keyMap = pageTaskList.stream().collect(Collectors.toMap(Task::getTaskDefinitionKey, his -> his));
@@ -1339,43 +1395,40 @@
// 鏈紑濮嬬殑浠诲姟锛屽叾鍏宠仈鐨勭敤鎴风粍杩欎簺閮藉彲浠ヤ粠UserTask涓嬁鍒帮紝鍥犱负鏈韩鏈紑濮嬬殑浠诲姟鏄病鏈塼ask鐨勶紝鎵�浠ヨ繖閲岀洿鎺ユ煡
if (StringUtils.isNotBlank(userTask.getAssignee())) {
vo.setHandlerType(HandlerTypeEnum.USER);
-
- // 澶勭悊鍙橀噺琛ㄨ揪寮�
- if (userTask.getAssignee().contains(ProcessConstants.DATA_LAUNCH)) {
- this.varReview(vo, projectId, processInsId);
- vos.add(vo);
- continue;
- }
SysUser sysUser = sysUserService.selectUserById(Long.parseLong(userTask.getAssignee()));
if (Objects.nonNull(sysUser)) {
- handlerIds.add(sysUser.getUserId());
- handlerNames.add(sysUser.getNickName());
+ vo.getHandlerId().add(sysUser.getUserId());
+ vo.getHandlerName().add(sysUser.getNickName());
if (Objects.nonNull(sysUser.getDept())) {
- handlerUnitIds.add(sysUser.getDept().getDeptId());
- handlerUnitNames.add(sysUser.getDept().getDeptName());
+ vo.getHandlerUnitId().add(sysUser.getDept().getDeptId());
+ vo.getHandlerUnitName().add(sysUser.getDept().getDeptName());
}
}
} else if (CollectionUtil.isNotEmpty(userTask.getCandidateGroups())) {
List<String> groupIds = userTask.getCandidateGroups();
for (String groupId : groupIds) {
- if (groupId.startsWith("dept")) { // 閮ㄩ棬鐨刬d鏄姞浜嗗墠缂�鐨勫锛歞ept:1
+ // 澶勭悊鍙橀噺琛ㄨ揪寮忥紝DATA_LAUNCH鍙彲鑳芥槸閮ㄩ棬涓嶄細鏄鑹诧紝鍥犱负浠ｈ〃鐨勬槸涓氫富閮ㄩ棬
+ if (groupId.contains(ProcessConstants.DATA_LAUNCH)) {
+ vo.setHandlerType(HandlerTypeEnum.DEPT);
+ this.varYzReview(vo, projectId, processInsId, HandlerTypeEnum.DEPT);
+ }
+ 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)) {
- handlerUnitIds.add(dept.getDeptId());
- handlerUnitNames.add(dept.getDeptName());
-
+ vo.getHandlerUnitId().add(dept.getDeptId());
+ vo.getHandlerUnitName().add(dept.getDeptName());
}
}
} else {
vo.setHandlerType(HandlerTypeEnum.ROLE);
SysRole role = sysRoleService.selectRoleById(Long.parseLong(groupId));
if (Objects.nonNull(role)) {
- handlerUnitIds.add(role.getRoleId());
- handlerUnitNames.add(role.getRoleName());
+ vo.getHandlerUnitId().add(role.getRoleId());
+ vo.getHandlerUnitName().add(role.getRoleName());
}
}
}
@@ -1400,11 +1453,11 @@
}
/**
- * 澶勭悊娴佺▼鍙橀噺鐨勫鐞嗕汉鍥炴樉
+ * 澶勭悊娴佺▼鍙橀噺-涓氫富鍗曚綅
*
* @param vo
*/
- private void varReview(CustomerTaskVO vo, Long projectId, String processInsId) {
+ private void varYzReview(CustomerTaskVO vo, Long projectId, String processInsId, HandlerTypeEnum type) {
ProjectProcess projectProcess = new LambdaQueryChainWrapper<>(projectProcessMapper)
.eq(ProjectProcess::getProjectId, projectId)
.eq(ProjectProcess::getProcessInsId, processInsId)
@@ -1412,11 +1465,26 @@
if (Objects.isNull(projectProcess)) {
throw new RuntimeException("璇ユ祦绋嬫湭缁戝畾椤圭洰");
}
- SysUser user = sysUserService.selectUserById(projectProcess.getDataLaunch());
- if (Objects.nonNull(user) && Objects.nonNull(user.getDept())) {
- vo.getHandlerName().add(user.getDept().getDeptName());
- vo.getHandlerId().add(user.getDept().getDeptId());
+ if (HandlerTypeEnum.USER.equals(type) || HandlerTypeEnum.FIX_USER.equals(type)) {
+ SysUser user = sysUserService.selectUserById(projectProcess.getDataLaunch());
+ if (Objects.nonNull(user) && Objects.nonNull(user.getDept())) {
+ vo.getHandlerName().add(user.getNickName());
+ vo.getHandlerId().add(user.getUserId());
+ }
+ } 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());
+ }
+ } else if (HandlerTypeEnum.ROLE.equals(type)) {
+ SysRole role = sysRoleService.selectRoleById(projectProcess.getDataLaunch());
+ if (Objects.nonNull(role)) {
+ vo.getHandlerUnitId().add(role.getRoleId());
+ vo.getHandlerUnitName().add(role.getRoleName());
+ }
}
+
this.distinctVo(vo);
}
--
Gitblit v1.8.0