diff --git a/server/apps/quality/models.py b/server/apps/quality/models.py index 5d19ee1..e26828c 100644 --- a/server/apps/quality/models.py +++ b/server/apps/quality/models.py @@ -38,6 +38,7 @@ class SubInspectTask(CommonAModel): 巡查子任务 """ name = models.CharField('子任务名', max_length=100) + inspecttask = models.ForeignKey(InspectTask, on_delete=models.CASCADE, verbose_name='所属任务') class Meta: verbose_name = '巡查子任务' @@ -56,5 +57,24 @@ class InspectTeam(CommonAModel): subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务') class Meta: - verbose_name = '巡查子任务' + verbose_name = '巡查组' verbose_name_plural = verbose_name + +class InspectOrg(CommonAModel): + """ + 受巡查组织 + """ + dept = models.ForeignKey(Organization, on_delete=models.CASCADE, verbose_name='受巡查组织') + subtask = models.ForeignKey(SubInspectTask, on_delete=models.CASCADE, verbose_name='关联子任务') + + class Meta: + verbose_name = '巡查组' + verbose_name_plural = verbose_name + +class InspectRecord(CommonAModel): + """ + 巡查记录 + """ + item = models.ForeignKey(InspectItem, on_delete=models.CASCADE, verbose_name='检查项') + dept = models.ForeignKey(Organization, on_delete=models.CASCADE, verbose_name='受检查单位') + \ No newline at end of file diff --git a/server/apps/quality/views.py b/server/apps/quality/views.py index 9668bfc..ada4e11 100644 --- a/server/apps/quality/views.py +++ b/server/apps/quality/views.py @@ -35,7 +35,7 @@ class InspectItemViewSet(CreateUpdateCustomMixin, ModelViewSet): ordering = ['sortnum', 'cate__sort', 'create_time'] -class InspectTaskViewSet(CreateUpdateCustomMixin, ListModelMixin, RetrieveModelMixin, GenericViewSet): +class InspectTaskViewSet(CreateUpdateCustomMixin, ModelViewSet): perms_map = {'get': '*', 'post': 'inspecttask_create', 'put': 'inspecttask_update', 'delete': 'inspecttask_delete'} queryset = InspectTask.objects.all()