标准rt新增已办办结的查询

ibzwf-core/src/main/java/cn/ibizlab/core/workflow/extensions/service/WFCoreService.java

@@ -2112,14 +2112,18 @@ public class WFCoreService
 		String strTaskType = context.getSrfWF();
 		if (strTaskType == null) {
 			tasks = wfCoreMapper.searchMyTask(context.getPages(),context,context.getSelectCond());
-		}else {
-			String tasktype = strTaskType.toUpperCase();
-
-			if (TaskType.DONE.name().equals(tasktype)) {
+		} else {
+			 if (TaskType.TODO.name().equalsIgnoreCase(strTaskType)) {
+				tasks = wfCoreMapper.searchMyTask(context.getPages(), context, context.getSelectCond());
+			 } else if (TaskType.DONE.name().equalsIgnoreCase(strTaskType)) {
 				tasks = wfCoreMapper.searchDoneTask(context.getPages(), context, context.getSelectCond());
-			} else if (TaskType.FINISH.name().equals(tasktype)) {
+			 } else if (TaskType.FINISH.name().equalsIgnoreCase(strTaskType)) {
 				tasks = wfCoreMapper.searchFinishTask(context.getPages(), context, context.getSelectCond());
-			}
+			 } else if (TaskType.ALL.name().equalsIgnoreCase(strTaskType)) {
+				 tasks = wfCoreMapper.searchMyAllTask(context.getPages(), context, context.getSelectCond());
+			 } else {
+				 throw new BadRequestAlertException(String.format("未能识别的待办类型[%s]", strTaskType), "", "");
+			 }
 		}
 
 		if (!ObjectUtils.isEmpty(tasks)) {

ibzwf-util/src/main/java/cn/ibizlab/util/enums/TaskType.java

@@ -8,6 +8,10 @@ public enum TaskType {
      * 待办
      */
     WORK,
+    /**
+     * 待办
+     */
+    TODO,
     /**
      * 待阅
      */
@@ -23,5 +27,13 @@ public enum TaskType {
     /**
      * 全部
      */
-    ALL;
+    ALL,
+    /**
+     * 抄送
+     */
+    CC,
+    /**
+     * 抄送已读
+     */
+    HAVEREAD;
 }