This commit is contained in:
那些花儿
2025-08-29 08:59:48 +08:00
parent 48cc8a448c
commit a408793a33
62 changed files with 15910 additions and 14042 deletions
@@ -36,18 +36,14 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
*/
boolean update(ProcessTask param);
/**
* 自定义分页查询流程任务
* @param param
* @return
*/
// CommonPage<ProcessTaskVO> page(ProcessTaskPageParam param);
/**
* 通过id查询
* @param id
* @return
*/
ProcessTaskVO findById(Long id);
/**
* 保存流程任务
* @param processTask
@@ -67,6 +63,7 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
* @return
*/
List<ProcessTask> getDoingTaskList(Long processInstanceId, String[] taskNames);
/**
* 根据流程实例ID获取已完成的任务
* @param processInstanceId 流程实例ID
@@ -74,6 +71,7 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
* @return
*/
List<ProcessTask> getDoneTaskList(Long processInstanceId, String[] taskNames);
/**
* 将流程任务修改为已完成
* @param processTaskId
@@ -104,12 +102,14 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
* @return
*/
ProcessTask getById(Long id);
/**
* 向指定的任务id添加参与者
* @param processTaskId 任务id
* @param actors 参与者
*/
void addTaskActor(Long processTaskId, List<String> actors);
/**
* 向指定的任务id添加参与者
* @param processTaskId 流程任务id
@@ -137,18 +137,7 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
* @return
*/
List<String> getTaskActors(Long processTaskId);
/**
* 查询待办列表
* @param param
* @return
*/
// CommonPage<ProcessTaskVO> todoList(ProcessTaskPageParam param);
/**
* 查询已办列表
* @param param
* @return
*/
// CommonPage<ProcessTaskVO> doneList(ProcessTaskPageParam param);
/**
* 根据当前任务对象驳回至上一步处理
* @param model 流程定义模型,用以获取上一步模型对象
@@ -164,12 +153,6 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
*/
List<LabelValueVO> jumpAbleTaskNameList(Long processInstanceId);
/**
* 分页查询获取候选人
* @param query
* @return
*/
// CommonPage<Map<String,Object>> candidatePage(Dict query);
/**
* 创建会签任务
* @param taskModel
@@ -177,6 +160,7 @@ public interface ProcessTaskService extends BaseService<ProcessTask> {
* @return
*/
List<ProcessTask> createCountersignTask(TaskModel taskModel, Execution execution);
/**
* 根据执行对象、自定义节点模型创建历史任务记录
* @param execution 执行对象
@@ -211,7 +211,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
if (CollectionUtil.isEmpty(actors)) return;
List<String> dbActors = getTaskActors(processTaskId);
List<String> newActors = actors.stream().filter(actor -> !dbActors.contains(actor)).toList();
Sql sql = Sqls.create("select id,username,loginname,unitname from vw_user where id in (@ids)");
Sql sql = Sqls.create("select id,username,loginname,unitName from vw_user where id in (@ids)");
sql.setParam("ids", newActors);
List<NutMap> list = listMap(sql);
@@ -221,7 +221,7 @@ public class ProcessTaskServiceImpl extends BaseServiceImpl<ProcessTask> impleme
processTaskActor.setActorId(actor.getString("id"));
processTaskActor.setActorName(actor.getString("username"));
processTaskActor.setActorAccount(actor.getString("loginname"));
processTaskActor.setActorUnitName(actor.getString("unitname"));
processTaskActor.setActorUnitName(actor.getString("unitName"));
processTaskActor.setCreatedAt(System.currentTimeMillis());
System.out.println(StrUtil.format("给任务:{},添加参与者:{}", processTaskId, actor.toString()));
insert(processTaskActor);