zcdsj
/
cma_search
mirror of https://e.coding.net/ctcdevteam/cma_search.git
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

This commit is contained in:
shilixia 2021-04-12 10:33:43 +08:00
parent 735d432472 b8cf7485f1
commit 3dd333b952
5 changed files with 125 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

69
server/apps/quality/migrations/0002_inspecttask_inspectteam_subinspecttask.py Normal file
View File

@ -0,0 +1,69 @@
# Generated by Django 3.0.5 on 2021-04-12 02:32
from django.conf import settings
from django.db import migrations, models
import django.db.models.deletion
import django.utils.timezone
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
('quality', '0001_initial'),
]
operations = [
migrations.CreateModel(
name='SubInspectTask',
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.CharField(max_length=100, verbose_name='子任务名')),
('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='subinspecttask_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='subinspecttask_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
],
options={
'verbose_name': '巡查子任务',
'verbose_name_plural': '巡查子任务',
},
),
migrations.CreateModel(
name='InspectTeam',
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='删除标记')),
('type', models.CharField(choices=[('组长', '组长'), ('组员', '组员')], default='组员', max_length=50, verbose_name='成员类型')),
('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspectteam_create_by', to=settings.AUTH_USER_MODEL, verbose_name='创建人')),
('member', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='成员')),
('subtask', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='quality.SubInspectTask', verbose_name='关联子任务')),
('update_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspectteam_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
],
options={
'verbose_name': '巡查子任务',
'verbose_name_plural': '巡查子任务',
},
),
migrations.CreateModel(
name='InspectTask',
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.CharField(max_length=100, verbose_name='任务名')),
('start_date', models.DateField(verbose_name='巡查开始日期')),
('end_date', models.DateField(verbose_name='巡查结束日期')),
('create_by', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='inspecttask_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='inspecttask_update_by', to=settings.AUTH_USER_MODEL, verbose_name='最后编辑人')),
],
options={
'verbose_name': '巡查任务',
'verbose_name_plural': '巡查任务',
},
),
]

41
server/apps/quality/models.py
View File

@ -21,7 +21,40 @@ class InspectItem(CommonAModel):
verbose_name = '检查清单'
verbose_name_plural = verbose_name
# class InspectTask(CommonAModel):
# """
# 巡查任务
# """
class InspectTask(CommonAModel):
"""
巡查任务
"""
name = models.CharField('任务名', max_length=100)
start_date = models.DateField('巡查开始日期')
end_date = models.DateField('巡查结束日期')
class Meta:
verbose_name = '巡查任务'
verbose_name_plural = verbose_name
class SubInspectTask(CommonAModel):
"""
巡查子任务
"""
name = models.CharField('子任务名', max_length=100)
class Meta:
verbose_name = '巡查子任务'
verbose_name_plural = verbose_name
class InspectTeam(CommonAModel):
"""
巡查组构成
"""
type_choices = (
('组长', '组长'),
('组员', '组员'),
)
member = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name='成员')
type = models.CharField('成员类型', max_length=50, choices=type_choices, default='组员')
subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务')
class Meta:
verbose_name = '巡查子任务'
verbose_name_plural = verbose_name

7
server/apps/quality/serializers.py
View File

@ -14,3 +14,10 @@ class InspectItemSerializer(serializers.ModelSerializer):
def setup_eager_loading(queryset):
queryset = queryset.select_related('cate')
return queryset
class InspectTaskSerializer(serializers.ModelSerializer):
create_by_ = UserSimpleSerializer(source='create_by', read_only=True)
class Meta:
model = InspectTask
fields = '__all__'

4
server/apps/quality/urls.py
View File

@ -1,10 +1,10 @@
from django.urls import path, include
from rest_framework import routers
from .views import InspectItemViewSet
from .views import InspectItemViewSet, InspectTaskViewSet
router = routers.DefaultRouter()
router.register('inspectitem', InspectItemViewSet, basename="inspectitem")
router.register('inspecttask', InspectTaskViewSet, basename="inspecttask")
urlpatterns = [
path('', include(router.urls))
]

11
server/apps/quality/views.py
View File

@ -6,7 +6,7 @@ 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.mixins import ListModelMixin, RetrieveModelMixin
from rest_framework.response import Response
from rest_framework.viewsets import GenericViewSet, ModelViewSet
from utils.pagination import PageOrNot
@ -33,3 +33,12 @@ class InspectItemViewSet(CreateUpdateCustomMixin, ModelViewSet):
search_fields = ['name', 'require']
filterset_fields = ['type','cate']
ordering = ['sortnum', 'cate__sort', 'create_time']
class InspectTaskViewSet(CreateUpdateCustomMixin, ListModelMixin, RetrieveModelMixin, GenericViewSet):
perms_map = {'get': '*', 'post': 'inspecttask_create',
'put': 'inspecttask_update', 'delete': 'inspecttask_delete'}
queryset = InspectTask.objects.all()
serializer_class = InspectTaskSerializer
search_fields = ['name']
ordering = ['-create_time']