From df63a0751de4a37a46e26bbf25feed0dd0f37e00 Mon Sep 17 00:00:00 2001 From: yangys <y_ys79@sina.com> Date: 星期一, 16 六月 2025 22:39:43 +0800 Subject: [PATCH] 增加超时查询接口 --- blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 49 insertions(+), 0 deletions(-) diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java index 0ab7275..d4113b7 100644 --- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java +++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/flow/service/FlowBusinessService.java @@ -48,6 +48,7 @@ import org.springblade.mdm.flow.util.MdmFlowCache; import org.springframework.stereotype.Service; +import java.util.Date; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -382,4 +383,52 @@ page.setRecords(flowList); return page; } + + /** + * 瓒呮椂浠诲姟鏌ヨ + * @param page + * @param keyword + * @return + */ + public IPage<BladeFlow> selectOvertimePage(IPage<BladeFlow> page, String assigneeName,String keyword) { + + List<BladeFlow> flowList = new LinkedList<>(); + Date now = new Date(); + TaskQuery todoQuery = taskService.createTaskQuery().taskDueBefore(now).active().includeProcessVariables(); + + if(Func.isNotEmpty(keyword)) { + todoQuery.taskVariableValueLike("assigneeName", "%"+assigneeName+"%"); + } + if(Func.isNotEmpty(keyword)){ + todoQuery.or(); + keyword = "%"+keyword+"%"; + todoQuery.processVariableValueLike("processNo",keyword); + todoQuery.processVariableValueLike("machineCode",keyword); + todoQuery.processVariableValueLike("machineMode",keyword); + + todoQuery.processVariableValueLike("processName",keyword); + todoQuery.processVariableValueLike("processEdition",keyword); + + todoQuery.processVariableValueLike("craftEdition",keyword); + //TODO 澶氫釜瀛楁閮借鍖归厤 + + todoQuery.endOr(); + } + + todoQuery.orderByTaskCreateTime().desc(); + + // 鏋勫缓鍒楄〃鏁版嵁 + BladeFlow bladeFlow = new BladeFlow(); + buildFlowTaskList(bladeFlow, flowList, todoQuery, "todo");//FlowEngineConstant.STATUS_TODO + + // 璁$畻鎬绘暟 + long count = todoQuery.count(); + // 璁剧疆椤垫暟 + page.setSize(count); + // 璁剧疆鎬绘暟 + page.setTotal(count); + // 璁剧疆鏁版嵁 + page.setRecords(flowList); + return page; + } } -- Gitblit v1.9.3