Skip to content

Commit 16ecccb

Browse files
committed
fix: The document list status filtering is incorrect. (#1822)
(cherry picked from commit 36f1a3b)
1 parent 5c6e1ad commit 16ecccb

File tree

2 files changed

+8
-7
lines changed

2 files changed

+8
-7
lines changed

apps/dataset/serializers/document_serializers.py

+7-6
Original file line numberDiff line numberDiff line change
@@ -143,20 +143,21 @@ def get_request_params_api():
143143
required=True,
144144
description='知识库id'),
145145
]
146+
146147
@staticmethod
147148
def get_request_body_api():
148149
return openapi.Schema(
149150
type=openapi.TYPE_OBJECT,
150151
required=['source_url_list'],
151152
properties={
152-
'source_url_list': openapi.Schema(type=openapi.TYPE_ARRAY, title="文档地址列表", description="文档地址列表",
153+
'source_url_list': openapi.Schema(type=openapi.TYPE_ARRAY, title="文档地址列表",
154+
description="文档地址列表",
153155
items=openapi.Schema(type=openapi.TYPE_STRING)),
154156
'selector': openapi.Schema(type=openapi.TYPE_STRING, title="选择器", description="选择器")
155157
}
156158
)
157159

158160

159-
160161
class DocumentInstanceSerializer(ApiMixin, serializers.Serializer):
161162
name = serializers.CharField(required=True,
162163
error_messages=ErrMessage.char("文档名称"),
@@ -396,8 +397,8 @@ def get_query_set(self):
396397
query_set = query_set.annotate(
397398
reversed_status=Reverse('status'),
398399
task_type_status=Substr('reversed_status', TaskType(task_type).value,
399-
TaskType(task_type).value),
400-
).filter(task_type_status__in=[State(status).value]).values('id')
400+
1),
401+
).filter(task_type_status=State(status).value).values('id')
401402
else:
402403
if status != State.SUCCESS.value:
403404
query_set = query_set.filter(status__icontains=status)
@@ -674,15 +675,15 @@ def cancel(self, instance, with_valid=True):
674675
ListenerManagement.update_status(QuerySet(Paragraph).annotate(
675676
reversed_status=Reverse('status'),
676677
task_type_status=Substr('reversed_status', TaskType(instance.get('type')).value,
677-
TaskType(instance.get('type')).value),
678+
1),
678679
).filter(task_type_status__in=[State.PENDING.value, State.STARTED.value]).filter(
679680
document_id=document_id).values('id'),
680681
TaskType(instance.get('type')),
681682
State.REVOKE)
682683
ListenerManagement.update_status(QuerySet(Document).annotate(
683684
reversed_status=Reverse('status'),
684685
task_type_status=Substr('reversed_status', TaskType(instance.get('type')).value,
685-
TaskType(instance.get('type')).value),
686+
1),
686687
).filter(task_type_status__in=[State.PENDING.value, State.STARTED.value]).filter(
687688
id=document_id).values('id'),
688689
TaskType(instance.get('type')),

ui/src/views/document/index.vue

+1-1
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@
136136
"
137137
class="justify-center"
138138
:command="beforeCommand('status', State.STARTED, TaskType.GENERATE_PROBLEM)"
139-
>生成问题中</el-dropdown-item
139+
>生成中</el-dropdown-item
140140
>
141141
</el-dropdown-menu>
142142
</template>

0 commit comments

Comments
 (0)