fix: 按资产编号导出时遵循用户输入顺序而非ID顺序
This commit is contained in:
+8
-1
@@ -289,6 +289,7 @@ def asset_export(request):
|
|||||||
# 按资产编号导出(支持逗号/空格/换行分隔多个编号,精确匹配)
|
# 按资产编号导出(支持逗号/空格/换行分隔多个编号,精确匹配)
|
||||||
asset_numbers_raw = request.GET.get('asset_numbers', '').strip()
|
asset_numbers_raw = request.GET.get('asset_numbers', '').strip()
|
||||||
missing_numbers = []
|
missing_numbers = []
|
||||||
|
ordered_assets = None
|
||||||
if asset_numbers_raw:
|
if asset_numbers_raw:
|
||||||
numbers = [n.strip() for n in asset_numbers_raw.replace(',', ',').replace('、', ',').replace('\n', ',').replace(' ', ',').split(',') if n.strip()]
|
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))
|
found = set(queryset.values_list('asset_number', flat=True))
|
||||||
missing_numbers = [n for n in numbers if n not in found]
|
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:
|
if missing_numbers:
|
||||||
messages.warning(
|
messages.warning(
|
||||||
@@ -306,7 +310,10 @@ def asset_export(request):
|
|||||||
f'以下 {len(missing_numbers)} 个资产编号未找到: {", ".join(missing_numbers)}'
|
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()
|
output = BytesIO()
|
||||||
wb.save(output)
|
wb.save(output)
|
||||||
|
|||||||
Reference in New Issue
Block a user