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 6641a69..e8826c5 100644 Binary files a/server/db.sqlite3 and b/server/db.sqlite3 differ