From 87ced2556d593c86e18254548ed96dc51f2dee4e Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 24 Sep 2020 10:03:10 +0800 Subject: [PATCH] ignore --- .gitignore | 1 + server/apps/ability/views.py | 2 ++ server/db.sqlite3 | Bin 44654592 -> 44654592 bytes 3 files changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 6796fb2..e2df6b3 100644 --- a/.gitignore +++ b/.gitignore @@ -7,6 +7,7 @@ media/ static/ __pycache__/ *.pyc +*.sqlite3 # client node_modules/ diff --git a/server/apps/ability/views.py b/server/apps/ability/views.py index 9fd66d4..cdd5961 100644 --- a/server/apps/ability/views.py +++ b/server/apps/ability/views.py @@ -120,6 +120,7 @@ class QualificationViewSet(ModelViewSet): search_fields = ['cma', 'cnas', 'sszx', 'other', 'service'] # ordering_fields = ['sszx'] ordering = 'sszx' + filterset_fields = ['sszx'] @action(methods=['get'], detail=False,url_name='qualification_group_by', perms_map = {'*':'*'}) def group(self, request, pk=None): @@ -146,6 +147,7 @@ class CNASViewSet(ModelViewSet): serializer_class = CNASSerializer search_fields = ['bzbh', 'bzmc', 'sszx', 'xmmc', 'bztk'] ordering_fields = ['bzmc'] + filterset_fields = ['sszx'] ordering = 'bzmc' @action(methods=['post'], detail=False, url_path='import', url_name='cnas_import', perms_map = {'post':'cnas_import'}) diff --git a/server/db.sqlite3 b/server/db.sqlite3 index 6641a69354ff9fc6bc2e6842395077ae2e032faf..e8826c5ae13115e489165c24204fb26c55b89f20 100644 GIT binary patch delta 13803 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 U0$PE?z!BhRY#*7w*uU8S4-y#MnE(I) delta 6208 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