From 4e2be858f4ccbb7490b59ed584fd1c829eb4d556 Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期二, 01 四月 2025 15:22:47 +0800
Subject: [PATCH] 修改审签问题
---
lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java | 95 +++++++++++++++++++----------------------------
1 files changed, 39 insertions(+), 56 deletions(-)
diff --git a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
index 3fe1de0..c9ae8f1 100644
--- a/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
+++ b/lxzn-module-flowable/src/main/java/org/jeecg/modules/flowable/service/impl/FlowTaskServiceImpl.java
@@ -1,20 +1,20 @@
package org.jeecg.modules.flowable.service.impl;
-
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONArray;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.google.common.collect.Lists;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.shiro.SecurityUtils;
-import org.flowable.bpmn.model.Process;
import org.flowable.bpmn.model.*;
+import org.flowable.bpmn.model.Process;
import org.flowable.common.engine.api.FlowableException;
import org.flowable.common.engine.api.FlowableObjectNotFoundException;
import org.flowable.common.engine.impl.identity.Authentication;
@@ -33,19 +33,18 @@
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.jeecg.common.api.vo.Result;
import org.jeecg.common.system.vo.LoginUser;
import org.jeecg.common.util.SpringContextUtils;
+import org.jeecg.modules.flowable.apithird.business.dto.FlowMyBusinessDto;
import org.jeecg.modules.flowable.apithird.business.entity.FlowMyBusiness;
import org.jeecg.modules.flowable.apithird.business.service.impl.FlowMyBusinessServiceImpl;
-import org.jeecg.modules.flowable.apithird.entity.ActStatus;
-import org.jeecg.modules.flowable.apithird.entity.SysUser;
-import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
-import org.jeecg.modules.flowable.apithird.service.IFlowThirdService;
import org.jeecg.modules.flowable.apithird.common.constant.ProcessConstants;
import org.jeecg.modules.flowable.apithird.common.enums.FlowComment;
import org.jeecg.modules.flowable.apithird.common.exception.CustomException;
+import org.jeecg.modules.flowable.apithird.entity.SysUser;
+import org.jeecg.modules.flowable.apithird.service.FlowCallBackServiceI;
+import org.jeecg.modules.flowable.apithird.service.IFlowThirdService;
import org.jeecg.modules.flowable.domain.dto.FlowCommentDto;
import org.jeecg.modules.flowable.domain.dto.FlowNextDto;
import org.jeecg.modules.flowable.domain.dto.FlowTaskDto;
@@ -96,6 +95,10 @@
taskService.saveTask(task);
}
SysUser loginUser = iFlowThirdService.getLoginUser();
+ //鍒ゆ柇鐢ㄦ埛鏄惁鏈夋潈闄�
+ if (!task.getAssignee().equals(loginUser.getUsername())){
+ return Result.error("褰撳墠鐢ㄦ埛鏃犳潈闄�");
+ }
if (DelegationState.PENDING.equals(task.getDelegationState())) {
taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.DELEGATE.getType(), taskVo.getComment());
//taskService.resolveTask(taskVo.getTaskId(), taskVo.getValues());
@@ -103,7 +106,6 @@
System.out.println("taskVo.getTaskId()--->taskVo.getInstanceId()--->FlowComment.NORMAL.getType()--->taskVo.getComment()"+taskVo.getTaskId() + "---" + taskVo.getInstanceId() + "---" + FlowComment.NORMAL.getType() + "---"+taskVo.getComment() );
taskService.addComment(taskVo.getTaskId(), taskVo.getInstanceId(), FlowComment.NORMAL.getType(), taskVo.getComment());
taskService.setAssignee(taskVo.getTaskId(), loginUser.getUsername());
- //taskService.complete(taskVo.getTaskId(), taskVo.getValues());
}
/*======================瀹℃壒缁撴潫 鍥炶皟浠ュ強鍏抽敭鏁版嵁淇濆瓨======================*/
//涓氬姟鏁版嵁id
@@ -157,8 +159,8 @@
if (task2!=null && task.getTaskDefinitionKey().equals(task2.getTaskDefinitionKey())){
// * 褰撳墠鑺傜偣鏄細绛捐妭鐐癸紝娌℃湁璧板畬
- business.setActStatus(ActStatus.doing)
- .setTaskId(task2.getId())
+ business.setTaskId(task2.getId())
+// .setActStatus(ActStatus.doing)
.setDoneUsers(doneUserList.toJSONString())
;
String todoUsersStr = business.getTodoUsers();
@@ -202,8 +204,9 @@
// 鍓嶇浼犲叆鍊欓�変汉
collect_username = candidateUsers;
}
- business.setActStatus(ActStatus.doing)
+ business
.setTaskId(task2.getId())
+// .setActStatus(ActStatus.doing)
.setTaskNameId(nextTask.getId())
.setTaskName(nextTask.getName())
.setPriority(nextTask.getPriority())
@@ -234,7 +237,7 @@
} else {
// **娌℃湁涓嬩竴涓妭鐐癸紝娴佺▼宸茬粡缁撴潫浜�
- business.setActStatus(ActStatus.pass)
+ business
.setDoneUsers(doneUserList.toJSONString())
.setTodoUsers("")
.setTaskId("")
@@ -250,11 +253,13 @@
if (flowCallBackService!=null)flowCallBackService.afterFlowHandle(business);
return Result.OK();
}
+
@Override
@Transactional(rollbackFor = Exception.class)
public Result completeByDateId(FlowTaskVo flowTaskVo){
return this.complete(flowTaskVo);
}
+
@Override
public void taskRejectByDataId(FlowTaskVo flowTaskVo){
FlowMyBusiness business = flowMyBusinessService.getByDataId(flowTaskVo.getDataId());
@@ -409,8 +414,9 @@
if (!doneUserList.contains(loginUser.getUsername())){
doneUserList.add(loginUser.getUsername());
}
- business.setActStatus(ActStatus.reject)
+ business
.setTaskId(task2.getId())
+// .setActStatus(ActStatus.reject)
.setTaskNameId(task2.getTaskDefinitionKey())
.setTaskName(task2.getName())
.setDoneUsers(doneUserList.toJSONString())
@@ -588,8 +594,9 @@
//**璺宠浆鍒扮洰鏍囪妭鐐�
List<Task> task2List = taskService.createTaskQuery().processInstanceId(business.getProcessInstanceId()).active().list();
Task targetTask = task2List.get(0);
- business.setActStatus(ActStatus.reject)
+ business
.setTaskId(targetTask.getId())
+// .setActStatus(ActStatus.reject)
.setTaskNameId(targetTask.getTaskDefinitionKey())
.setTaskName(targetTask.getName())
.setPriority(targetTask.getPriority()+"")
@@ -872,7 +879,7 @@
String myTaskId = null;
HistoricTaskInstance myTask = null;
for (HistoricTaskInstance hti : htiList) {
- if (loginUser.getUsername().toString().equals(hti.getAssignee())) {
+ if (loginUser.getUsername().equals(hti.getAssignee())) {
myTaskId = hti.getId();
myTask = hti;
break;
@@ -970,56 +977,32 @@
* @return
*/
@Override
- public Result finishedList(Integer pageNum, Integer pageSize) {
- Page<FlowTaskDto> page = new Page<>();
+ public Result finishedList(Integer pageNum, Integer pageSize, FlowMyBusinessDto flowMyBusinessDto) {
+ //淇敼鏌ヨ锛屾坊鍔犳煡璇㈡潯浠�
+ Page page = new Page(pageNum, pageSize);
String username = iFlowThirdService.getLoginUser().getUsername();
- HistoricTaskInstanceQuery taskInstanceQuery = historyService.createHistoricTaskInstanceQuery()
- .includeProcessVariables()
- .finished()
- .taskAssignee(username)
- .orderByHistoricTaskInstanceEndTime()
- .desc();
- List<HistoricTaskInstance> historicTaskInstanceList = taskInstanceQuery.listPage((pageNum - 1)*pageSize, pageSize);
- List<FlowTaskDto> hisTaskList = Lists.newArrayList();
- for (HistoricTaskInstance histTask : historicTaskInstanceList) {
- FlowTaskDto flowTask = new FlowTaskDto();
- // 褰撳墠娴佺▼淇℃伅
- flowTask.setTaskId(histTask.getId());
- // 瀹℃壒浜哄憳淇℃伅
- flowTask.setCreateTime(histTask.getCreateTime());
- flowTask.setFinishTime(histTask.getEndTime());
- flowTask.setDuration(getDate(histTask.getDurationInMillis()));
- flowTask.setProcDefId(histTask.getProcessDefinitionId());
- flowTask.setTaskDefKey(histTask.getTaskDefinitionKey());
- flowTask.setTaskName(histTask.getName());
- flowTask.setDescription(flowMyBusinessService.getByProcessInstanceId(histTask.getProcessInstanceId()).getTitle());
+ flowMyBusinessDto.setCurrentUser(username);
+ IPage<FlowTaskDto> flowTaskDtoIPage = flowMyBusinessService.getPageListMyBusiness(page,flowMyBusinessDto);
+ flowTaskDtoIPage.getRecords().forEach(flowTaskDto -> {
// 娴佺▼瀹氫箟淇℃伅
ProcessDefinition pd = repositoryService.createProcessDefinitionQuery()
- .processDefinitionId(histTask.getProcessDefinitionId())
+ .processDefinitionId(flowTaskDto.getProcessDefinitionId())
.singleResult();
- flowTask.setDeployId(pd.getDeploymentId());
- flowTask.setProcDefName(pd.getName());
- flowTask.setProcDefVersion(pd.getVersion());
- flowTask.setProcInsId(histTask.getProcessInstanceId());
- flowTask.setHisProcInsId(histTask.getProcessInstanceId());
-
+ flowTaskDto.setDeployId(pd.getDeploymentId());
+ flowTaskDto.setProcDefName(pd.getName());
+ flowTaskDto.setProcDefVersion(pd.getVersion());
+ flowTaskDto.setCategory(pd.getCategory());
// 娴佺▼鍙戣捣浜轰俊鎭�
HistoricProcessInstance historicProcessInstance = historyService.createHistoricProcessInstanceQuery()
- .processInstanceId(histTask.getProcessInstanceId())
+ .processInstanceId(flowTaskDto.getProcInsId())
.singleResult();
SysUser startUser = iFlowThirdService.getUserByUsername(historicProcessInstance.getStartUserId());
- flowTask.setStartUserId(startUser.getUsername());
- flowTask.setStartUserName(startUser.getRealname());
+ flowTaskDto.setStartUserId(startUser.getUsername());
+ flowTaskDto.setStartUserName(startUser.getRealname());
List<String> departNamesByUsername = iFlowThirdService.getDepartNamesByUsername(historicProcessInstance.getStartUserId());
- flowTask.setStartDeptName(CollUtil.join(departNamesByUsername,"锛�"));
- hisTaskList.add(flowTask);
- }
- page.setTotal(hisTaskList.size());
- page.setRecords(hisTaskList);
-// Map<String, Object> result = new HashMap<>();
-// result.put("result",page);
-// result.put("finished",true);
- return Result.OK(page);
+ flowTaskDto.setStartDeptName(CollUtil.join(departNamesByUsername,"锛�"));
+ });
+ return Result.OK(flowTaskDtoIPage);
}
private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
--
Gitblit v1.9.3