From fa4c839fb8ce412aa4079244225251d3a75472f3 Mon Sep 17 00:00:00 2001 From: caoqianming Date: Fri, 9 Apr 2021 17:30:54 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0quality?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../apps/quality/migrations/0001_initial.py | 39 +++++++++++++++++++ server/apps/quality/models.py | 23 +++++++++++ server/apps/quality/serializers.py | 16 ++++++++ server/apps/quality/urls.py | 10 +++++ server/apps/quality/views.py | 32 +++++++++++++++ server/server/urls.py | 1 + 6 files changed, 121 insertions(+) create mode 100644 server/apps/quality/migrations/0001_initial.py create mode 100644 server/apps/quality/serializers.py create mode 100644 server/apps/quality/urls.py diff --git a/server/apps/quality/migrations/0001_initial.py b/server/apps/quality/migrations/0001_initial.py new file mode 100644 index 0000000..e7d758a --- /dev/null +++ b/server/apps/quality/migrations/0001_initial.py @@ -0,0 +1,39 @@ +# Generated by Django 3.0.5 on 2021-04-09 08:48 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('system', '0016_auto_20210331_1040'), + ] + + operations = [ + migrations.CreateModel( + name='InspectItem', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('create_time', models.DateTimeField(default=django.utils.timezone.now, help_text='创建时间', verbose_name='创建时间')), + ('update_time', models.DateTimeField(auto_now=True, help_text='修改时间', verbose_name='修改时间')), + ('is_deleted', models.BooleanField(default=False, help_text='删除标记', verbose_name='删除标记')), + ('name', models.TextField(verbose_name='名称')), + ('type', models.CharField(choices=[('合规', '合规'), ('体系', '体系')], default='合规', max_length=50, verbose_name='类型')), + ('require', models.TextField(blank=True, null=True, verbose_name='取证要求')), + ('sortnum', models.IntegerField(default=1, verbose_name='序号')), + ('cate', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='system.Dict')), + ('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspectitem_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')), + ('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspectitem_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')), + ], + options={ + 'verbose_name': '检查清单', + 'verbose_name_plural': '检查清单', + }, + ), + ] diff --git a/server/apps/quality/models.py b/server/apps/quality/models.py index 0feccb7..01f117b 100644 --- a/server/apps/quality/models.py +++ b/server/apps/quality/models.py @@ -2,3 +2,26 @@ from django.db import models from utils.model import BaseModel from apps.system.models import CommonAModel, CommonBModel, Organization, User, Dict, File # Create your models here. + +class InspectItem(CommonAModel): + """ + 检查条款 + """ + type_choices = ( + ('合规', '合规'), + ('体系', '体系'), + ) + name = models.TextField('名称') + cate = models.ForeignKey(Dict, on_delete=models.SET_NULL, null=True, blank=True) + type = models.CharField('类型', max_length=50, choices=type_choices, default='合规') + require = models.TextField('取证要求', null=True, blank=True) + sortnum = models.IntegerField('序号', default=1) + + class Meta: + verbose_name = '检查清单' + verbose_name_plural = verbose_name + +# class InspectTask(CommonAModel): +# """ +# 巡查任务 +# """ \ No newline at end of file diff --git a/server/apps/quality/serializers.py b/server/apps/quality/serializers.py new file mode 100644 index 0000000..d6e095b --- /dev/null +++ b/server/apps/quality/serializers.py @@ -0,0 +1,16 @@ +from django.db.models.base import Model +from rest_framework import serializers +from .models import * +from apps.system.serializers import OrganizationSerializer,FileListSerializer,UserSimpleSerializer,OrganizationSimpleSerializer, FileSimpleSerializer + + +class InspectItemSerializer(serializers.ModelSerializer): + cate_name = serializers.StringRelatedField(source='cate', read_only=True) + class Meta: + model = InspectItem + fields = '__all__' + + @staticmethod + def setup_eager_loading(queryset): + queryset = queryset.select_related('cate') + return queryset diff --git a/server/apps/quality/urls.py b/server/apps/quality/urls.py new file mode 100644 index 0000000..33b2842 --- /dev/null +++ b/server/apps/quality/urls.py @@ -0,0 +1,10 @@ +from django.urls import path, include +from rest_framework import routers +from .views import InspectItemViewSet + +router = routers.DefaultRouter() +router.register('inspectitem', InspectItemViewSet, basename="inspectitem") + +urlpatterns = [ + path('', include(router.urls)) +] \ No newline at end of file diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index 91ea44a..2c480a4 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -1,3 +1,35 @@ +from django.conf import settings +from django.core.cache import cache +from django.db.models import Count, Q +from django.db.models.query import QuerySet from django.shortcuts import render +from django.utils import timezone +from rest_framework import status +from rest_framework.decorators import action, permission_classes +from rest_framework.mixins import ListModelMixin +from rest_framework.response import Response +from rest_framework.viewsets import GenericViewSet, ModelViewSet +from utils.pagination import PageOrNot + +from apps.system.mixins import CreateUpdateCustomMixin +from apps.system.models import Organization +from apps.system.permission import get_permission_list, has_permission +from apps.system.permission_data import RbacFilterSet + +from .models import * +from .serializers import * # Create your views here. + +class InspectItemViewSet(CreateUpdateCustomMixin, ModelViewSet): + """ + 检查表清单：增删改查 + """ + perms_map = {'get': '*', 'post': 'inspectitem', + 'put': 'inspectitem', 'delete': 'inspectitem'} + queryset = InspectItem.objects.all() + serializer_class = InspectItemSerializer + pagination_class = None + search_fields = ['name', 'require'] + filterset_fields = ['type','cate'] + ordering = ['sortnum', 'cate__sort', 'create_time'] diff --git a/server/server/urls.py b/server/server/urls.py index 11f10bb..59f34d8 100644 --- a/server/server/urls.py +++ b/server/server/urls.py @@ -65,6 +65,7 @@ urlpatterns = [ path('api/system/', include('apps.system.urls')), path('api/ability/', include('apps.ability.urls')), path('api/supervision/', include('apps.supervision.urls')), + path('api/quality/', include('apps.quality.urls')), path('api/docs/', include_docs_urls(title="接口文档",authentication_classes=[], permission_classes=[])), path('api/', include(router.urls)), ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)