From 1d7babafe7f7727c45c99f095addd1f29daa0e91 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Tue, 18 Jun 2024 17:54:50 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=B7=BB=E5=8A=A0hazard=E8=B7=AF?=
 =?UTF-8?q?=E7=94=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/dpm/models.py      |  2 +-
 apps/dpm/serializers.py |  8 +++++++-
 apps/dpm/urls.py        |  3 ++-
 apps/dpm/views.py       | 11 ++++++++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/apps/dpm/models.py b/apps/dpm/models.py
index fd4dfe10..fda87e3d 100644
--- a/apps/dpm/models.py
+++ b/apps/dpm/models.py
@@ -88,7 +88,7 @@ class CheckWork(CommonAModel):
     checktaskset = models.ForeignKey(CheckTaskSet, verbose_name='关联派发策略', on_delete=models.CASCADE, null=True, blank=True)
 
 
-class Hazard(CommonAModel):
+class Hazard(CommonADModel):
     """
     事故隐患表
     """
diff --git a/apps/dpm/serializers.py b/apps/dpm/serializers.py
index 74a0fb0f..6a882209 100644
--- a/apps/dpm/serializers.py
+++ b/apps/dpm/serializers.py
@@ -1,5 +1,5 @@
 import json
-from apps.dpm.models import CheckTaskSet, CheckWork, RiskPoint, Risk
+from apps.dpm.models import CheckTaskSet, CheckWork, RiskPoint, Risk, Hazard
 from rest_framework import serializers
 from apps.utils.serializers import CustomModelSerializer
 from apps.utils.constants import EXCLUDE_FIELDS
@@ -135,3 +135,9 @@ class CheckWorkSerializer(CustomModelSerializer):
     class Meta:
         model = CheckWork
         fields = '__all__'
+
+
+class HazardSerializer(CustomModelSerializer):
+    class Meta:
+        model = Hazard
+        fields = '__all__'
\ No newline at end of file
diff --git a/apps/dpm/urls.py b/apps/dpm/urls.py
index 5afdd73e..cebaa131 100644
--- a/apps/dpm/urls.py
+++ b/apps/dpm/urls.py
@@ -1,4 +1,4 @@
-from apps.dpm.views import RiskPointViewSet, RiskViewSet, CheckTaskSetViewSet
+from apps.dpm.views import RiskPointViewSet, RiskViewSet, CheckTaskSetViewSet, HazardViewSet
 from django.urls import path, include
 from rest_framework.routers import DefaultRouter
 
@@ -9,6 +9,7 @@ router = DefaultRouter()
 router.register('riskpoint', RiskPointViewSet, basename='riskpoint')
 router.register('risk', RiskViewSet, basename='risk')
 router.register('checktaskset', CheckTaskSetViewSet, basename='checktaskset')
+router.register('hazard', HazardViewSet, basename='hazard')
 urlpatterns = [
     path(API_BASE_URL, include(router.urls)),
 ]
diff --git a/apps/dpm/views.py b/apps/dpm/views.py
index 0520f39e..a5c5cb4d 100644
--- a/apps/dpm/views.py
+++ b/apps/dpm/views.py
@@ -1,7 +1,10 @@
-from apps.dpm.serializers import RiskPointCreateUpdateSerializer, RiskPointSerializer, RiskCreateUpdateSerializer, RiskSerializer, CheckTaskSetCreateSerializer, CheckTaskSetUpdateSerializer, CheckTaskSetSerializer, CheckWork_10_CreateUpdateSerializer, CheckWorkSerializer
+from apps.dpm.serializers import (RiskPointCreateUpdateSerializer, RiskPointSerializer, RiskCreateUpdateSerializer, RiskSerializer, 
+                                  CheckTaskSetCreateSerializer, CheckTaskSetUpdateSerializer, 
+                                  CheckTaskSetSerializer, CheckWork_10_CreateUpdateSerializer, 
+                                  CheckWorkSerializer, HazardSerializer)
 from apps.utils.viewsets import CustomModelViewSet, CustomGenericViewSet
 from apps.utils.mixins import CustomListModelMixin, BulkDestroyModelMixin, BulkCreateModelMixin
-from apps.dpm.models import CheckTaskSet, CheckWork, RiskPoint, Risk
+from apps.dpm.models import CheckTaskSet, CheckWork, RiskPoint, Risk, Hazard
 from rest_framework.decorators import action
 from rest_framework.response import Response
 from django.db import transaction
@@ -69,4 +72,6 @@ class CheckWorkViewSet(CustomModelViewSet):
 
 
 class HazardViewSet(CustomModelViewSet):
-    pass
+    queryset = Hazard.objects.all()
+    serializer_class = HazardSerializer
+    select_related_fields = ["checkwork", "area", "dept_res", "user_discover"]