diff --git a/apps/asm/models.py b/apps/asm/models.py index 758103a9..d576f442 100644 --- a/apps/asm/models.py +++ b/apps/asm/models.py @@ -2,7 +2,6 @@ from apps.utils.models import CommonADModel, CommonBDModel from django.db import models class AssetAudit(CommonBDModel): - org = models. asset_data = models.JSONField(verbose_name='资产信息', blank=True, null=True) ticket = models.OneToOneField('wf.ticket', verbose_name='关联工单', on_delete=models.SET_NULL, related_name='asset_ticket', null=True, blank=True, db_constraint=False) diff --git a/apps/asm/serializers.py b/apps/asm/serializers.py index ab862374..bae7d358 100644 --- a/apps/asm/serializers.py +++ b/apps/asm/serializers.py @@ -1,4 +1,4 @@ -from apps.asm.models import Asset, AssetLog +from apps.asm.models import Asset, AssetAudit from apps.utils.serializers import CustomModelSerializer from apps.utils.constants import EXCLUDE_FIELDS_DEPT @@ -11,6 +11,6 @@ class AssetSerializer(CustomModelSerializer): class AssetlogSerializer(CustomModelSerializer): class Meta: - model = AssetLog + model = AssetAudit fields = '__all__' read_only_fields = EXCLUDE_FIELDS_DEPT \ No newline at end of file diff --git a/apps/asm/urls.py b/apps/asm/urls.py index bdd751ce..00f732ed 100644 --- a/apps/asm/urls.py +++ b/apps/asm/urls.py @@ -1,12 +1,12 @@ from django.urls import path, include from rest_framework.routers import DefaultRouter -from apps.asm.views import AssetViewSet, AssetLogViewSet +from apps.asm.views import AssetViewSet, AssetAuditViewSet API_BASE_URL = 'api/asm/' router = DefaultRouter() router.register('asset', AssetViewSet, basename='asset') -router.register('assetlog', AssetLogViewSet, basename='assetlog') +router.register('assetlog', AssetAuditViewSet, basename='assetlog') urlpatterns = [ path(API_BASE_URL, include(router.urls)), ] \ No newline at end of file diff --git a/apps/asm/views.py b/apps/asm/views.py index c0594c06..91a6ed7e 100644 --- a/apps/asm/views.py +++ b/apps/asm/views.py @@ -1,6 +1,6 @@ from apps.wf.mixins import TicketMixin from apps.utils.viewsets import CustomModelViewSet -from apps.asm.models import Asset, AssetLog +from apps.asm.models import Asset from rest_framework.exceptions import ParseError from apps.asm.serializers import AssetSerializer, AssetlogSerializer from apps.wf.models import Ticket