流程监控增加流程类别搜索

src/main/java/com/xjrsoft/module/workflow/dto/MonitorPageDto.java

@@ -32,4 +32,9 @@ public class MonitorPageDto extends PageInput {
     @NotNull(message = "参数比如传入类型！0 代表未完成 1 代表完成")
     private Integer type;
 
+
+    @ApiModelProperty("流程类型id")
+    @NotNull(message = "流程类型id不能为空")
+    private String category;
+
 }

src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -43,6 +43,7 @@ import com.xjrsoft.module.oa.mapper.OfficialDocumentReceivedMapper;
 import com.xjrsoft.module.organization.entity.User;
 import com.xjrsoft.module.organization.entity.UserRoleRelation;
 import com.xjrsoft.module.organization.service.IUserService;
+import com.xjrsoft.module.system.entity.DictionaryDetail;
 import com.xjrsoft.module.system.entity.File;
 import com.xjrsoft.module.system.entity.Stamp;
 import com.xjrsoft.module.system.service.IFileService;
@@ -4024,8 +4025,15 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
 
         List<MonitorPageVo> result = new ArrayList<>(historicProcessInstances.size());
         if (processIds.size() > 0) {
-
-            List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(Wrappers.lambdaQuery(WorkflowExtra.class).in(WorkflowExtra::getProcessId, processIds));
+            List<WorkflowExtra> workflowExtras = extraService.list(
+                    new MPJLambdaWrapper<WorkflowExtra>()
+                            .leftJoin(WorkflowSchema.class, WorkflowSchema::getId, WorkflowExtra::getSchemaId)
+                            .leftJoin(DictionaryDetail.class, DictionaryDetail::getId, WorkflowSchema::getCategory)
+                            .eq(StrUtil.isNotEmpty(dto.getCategory()), DictionaryDetail::getCode, dto.getCategory())
+            );
+//            List<WorkflowExtra> workflowExtras = workflowExtraMapper.selectList(
+//                    Wrappers.lambdaQuery(WorkflowExtra.class).in(WorkflowExtra::getProcessId, processIds)
+//            );
 
             for (HistoricProcessInstance historicProcessInstance : historicProcessInstances) {