..

src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java

@@ -1,6 +1,7 @@
 package com.budwk.app.flow.controller;
 
 import cn.dev33.satoken.annotation.SaCheckLogin;
+import cn.hutool.core.util.StrUtil;
 import com.budwk.app.base.page.Pagination;
 import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.entity.ProcessInstance;
@@ -53,7 +54,8 @@ public class FlowTodoCenterController {
                   ins.state AS instanceState,
                   ins.id AS instanceId,
                   ins.businessNo,
-                  cat.`name` categoryName
+                  cat.`name` categoryName,
+                  ins.variable ->> '$.instanceName' AS instanceName
                 FROM
                   wf_process_task t
                   LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
@@ -65,6 +67,10 @@ public class FlowTodoCenterController {
         Cnd cnd = Cnd.NEW();
         cnd.and("t.taskState", "=", ProcessTaskStateEnum.DOING.getCode());
         cnd.and("ta.actorId", "=", SecurityUtil.getUserId());
+        cnd.andEX("def.category","=",category);
+        if(StrUtil.isNotBlank(searchKeyword)){
+            cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword);
+        }
         cnd.desc("t.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);
@@ -92,7 +98,8 @@ public class FlowTodoCenterController {
                   ins.state AS instanceState,
                   ins.id AS instanceId,
                   ins.businessNo,
-                  cat.`name` categoryName
+                  cat.`name` categoryName,
+                  ins.variable ->> '$.instanceName' AS instanceName
                 FROM
                   wf_process_task t
                   LEFT JOIN wf_process_task_actor ta ON ta.processTaskId = t.id
@@ -104,6 +111,10 @@ public class FlowTodoCenterController {
         Cnd cnd = Cnd.NEW();
         cnd.and("t.taskState", "=", ProcessTaskStateEnum.FINISHED.getCode());
         cnd.and("ta.actorId", "=", SecurityUtil.getUserId());
+        cnd.andEX("def.category","=",category);
+        if(StrUtil.isNotBlank(searchKeyword)){
+            cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword);
+        }
         cnd.desc("t.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);
@@ -127,6 +138,7 @@ public class FlowTodoCenterController {
                   ins.operator,
                   ins.variable,
                   ins.createdAt,
+                  ins.variable ->> '$.instanceName' AS instanceName,
                   GROUP_CONCAT(DISTINCT t.displayName) as taskName,
                   cat.`name` categoryName
                 FROM
@@ -138,6 +150,11 @@ public class FlowTodoCenterController {
                 """);
         Cnd cnd = Cnd.NEW();
         cnd.and("ins.operator", "=", SecurityUtil.getUserId());
+        cnd.andEX("def.category","=",category);
+        if(StrUtil.isNotBlank(searchKeyword)){
+            cnd.where().andLike("ins.variable ->> '$.instanceName'", searchKeyword);
+        }
+        cnd.groupBy("ins.id");
         cnd.desc("ins.createdAt");
         sql.setCondition(cnd);
         Pagination pagination = sysUserService.listPageMap(pageNumber, pageSize, sql);