电签中

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 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!='当前等待电签的批次较多，请等待几分钟后刷新页面查看........' OR u_task_parallel.e_visa_content IS NULL))");
+                    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_status =0 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 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!='当前等待电签的批次较多，请等待几分钟后刷新页面查看........' OR u_task_parallel.e_visa_content IS NULL))");
+                    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_status =0 AND u_task_parallel.e_visa_content!='当前等待电签的批次较多，请等待几分钟后刷新页面查看........')");
                     params.add(1);
                     params.add(SecureUtil.getUserId());
                     sqlString.append(" AND status = 1");
@@ -1766,14 +1766,14 @@ public class TaskController extends BladeController {
                 }
             } else if (dto.getSelectedType().equals(2)) {
                 // 已办页面逻辑
-                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 in(2,3) AND u_task_parallel.task_user = ?)");
+                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.task_user = ? AND u_task_parallel.e_visa_status >0)");
                 params.add(SecureUtil.getUserId());
             } else if (dto.getSelectedType().equals(3)) {
                 // 我发起页面逻辑
                 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.status = ? AND u_task_parallel.task_user = ? AND u_task_parallel.e_visa_content='当前等待电签的批次较多，请等待几分钟后刷新页面查看........')");
+                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_status =0 AND u_task_parallel.e_visa_content='当前等待电签的批次较多，请等待几分钟后刷新页面查看........')");
                 params.add(1);
                 params.add(SecureUtil.getUserId());
                 sqlString.append(" AND status = 1");