[修改] 流程中心搜索

report-activity/src/main/java/com/adc/da/wkflow/business_activiti/task/TodoTaskController.java

@@ -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())
+        queryWrapper.and((wrapper)->{
-                .or().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+            wrapper.lambda().eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.SUBMIT.getValue())
+                    .or().
+                    eq(BusProcessName::getSubmitStatus,SubmitStatusEnum.STOP.getValue());
+        });
 
         List<BusProcessName> list = iBusProcessNameService.list(queryWrapper);