From e894f61ddf5c3ef34f9092cbbf5e40c9445e719e Mon Sep 17 00:00:00 2001 From: cnbugs Date: Fri, 6 Nov 2026 13:15:05 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E6=8C=89=E8=B5=84=E4=BA=A7=E7=BC=96?= =?UTF-8?q?=E5=8F=B7=E5=AF=BC=E5=87=BA=E6=97=B6=E9=81=B5=E5=BE=AA=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E8=BE=93=E5=85=A5=E9=A1=BA=E5=BA=8F=E8=80=8C=E9=9D=9E?= =?UTF-8?q?ID=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assetapp/views.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/assetapp/views.py b/assetapp/views.py index 2498735..8b5c7a9 100644 --- a/assetapp/views.py +++ b/assetapp/views.py @@ -289,6 +289,7 @@ def asset_export(request): # 按资产编号导出(支持逗号/空格/换行分隔多个编号,精确匹配) asset_numbers_raw = request.GET.get('asset_numbers', '').strip() missing_numbers = [] + ordered_assets = None if asset_numbers_raw: numbers = [n.strip() for n in asset_numbers_raw.replace(',', ',').replace('、', ',').replace('\n', ',').replace(' ', ',').split(',') if n.strip()] # 去重,保持顺序 @@ -299,6 +300,9 @@ def asset_export(request): # 检查哪些编号不存在 found = set(queryset.values_list('asset_number', flat=True)) missing_numbers = [n for n in numbers if n not in found] + # 按用户输入的编号顺序导出(而非默认ID顺序) + rank = {n: i for i, n in enumerate(numbers)} + ordered_assets = sorted(queryset, key=lambda a: rank.get(a.asset_number, len(rank))) if missing_numbers: messages.warning( @@ -306,7 +310,10 @@ def asset_export(request): f'以下 {len(missing_numbers)} 个资产编号未找到: {", ".join(missing_numbers)}' ) - wb = export_assets_to_excel(queryset) + if asset_numbers_raw: + wb = export_assets_to_excel(ordered_assets) + else: + wb = export_assets_to_excel(queryset) output = BytesIO() wb.save(output)