[修改] 流程中心搜索

2023-05-16 10:15:16 +08:00
parent c94ac509e9
commit 0b39a1454d
3 changed files with 17 additions and 4 deletions
@@ -827,6 +827,9 @@ public class TodoTaskController {
        } else {
            queryWrapper.isNotNull("PRC_TYPE");
        }
+        if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) {
+            queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName());
+        }

        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.DRAFT.getValue());
        queryWrapper.orderByDesc("CREAT_TIME");
@@ -917,7 +920,9 @@ public class TodoTaskController {
        if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
            queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
        }
-
+        if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) {
+            queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName());
+        }
        queryWrapper.orderByDesc("CREAT_TIME");
        queryWrapper.isNotNull("PRC_ID");
        queryWrapper.isNotNull("PRC_NUM");
@@ -1112,6 +1117,9 @@ public class TodoTaskController {
            if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
                queryWrapper.eq("PRC_TYPE", taskCommonQuery.getPrcType());
            }
+            if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) {
+                queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName());
+            }
            queryWrapper.and((wrapper)->{
                wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
                        .or().
@@ -1284,11 +1292,16 @@ public class TodoTaskController {
        if (taskCommonQuery.getPrcType() != null && !taskCommonQuery.getPrcType().equals("")) {
            queryWrapper.likeRight("PRC_TYPE", taskCommonQuery.getPrcType());
        }
-
+        if (taskCommonQuery.getCreatUserName() != null && !taskCommonQuery.getCreatUserName().equals("")) {
+            queryWrapper.like("CREATE_USER_NAME", taskCommonQuery.getCreatUserName());
+        }
        queryWrapper.isNotNull("PRC_ID");
        queryWrapper.isNotNull("PRC_NAME");
-        queryWrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
-                .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+        queryWrapper.and((wrapper)->{
+            wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                    .or().
+                    eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+        });

        List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);