任务查看新增电签中

blade-service-api/blade-business-api/src/main/java/org/springblade/business/dto/BusinessTaskDTO.java

@@ -12,7 +12,7 @@ import java.io.Serializable;
 @Data
 public class BusinessTaskDTO implements Serializable {
 
-    @ApiModelProperty(value = "选择菜单类型，1=待办，2=已办，3=我发起的")
+    @ApiModelProperty(value = "选择菜单类型，1=待办，2=已办，3=我发起的 4=电签中")
     private Integer selectedType;
 
     @ApiModelProperty(value = "任务类型")

blade-service/blade-business/src/main/java/org/springblade/business/controller/TaskController.java

@@ -1743,7 +1743,7 @@ public class TaskController extends BladeController {
             if (dto.getSelectedType().equals(1)) {
                 // 待办页面逻辑
                 if (ObjectUtil.isNotEmpty(dto.getStatusValue()) && dto.getStatusValue().equals(1)) {
-                    sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE is_resign = 0 and u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
+                    sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ? AND u_task_parallel.e_visa_content!='当前等待电签的批次较多，请等待几分钟后刷新页面查看........')");
                     params.add(1);
                     params.add(SecureUtil.getUserId());
                     // 关联电签状态字段
@@ -1757,7 +1757,7 @@ public class TaskController extends BladeController {
                     return R.data(emptyPage);
                 } else {
                     // 待办页未选状态：默认查待审批
-                    sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE is_resign = 0 and u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ?)");
+                    sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.status = ? AND u_task_parallel.task_user = ? AND u_task_parallel.e_visa_content!='当前等待电签的批次较多，请等待几分钟后刷新页面查看........')");
                     params.add(1);
                     params.add(SecureUtil.getUserId());
                     sqlString.append(" AND status = 1");
@@ -1772,6 +1772,9 @@ public class TaskController extends BladeController {
                 // 我发起页面逻辑
                 sqlString.append("report_user = ?");
                 params.add(SecureUtil.getUserId());
+            } else if (dto.getSelectedType().equals(4)) {
+                sqlString.append("EXISTS (SELECT 1 FROM u_task_parallel WHERE u_task.process_instance_id = u_task_parallel.process_instance_id AND u_task_parallel.e_visa_content='当前等待电签的批次较多，请等待几分钟后刷新页面查看........' AND u_task_parallel.task_user = ?)");
+                params.add(SecureUtil.getUserId());
             }
             sqlString.append(")");
         }