From c5110d336109393c559b8594e0f1cd212c8f7e4f Mon Sep 17 00:00:00 2001 From: TianyangZhang Date: Tue, 4 Nov 2025 11:17:08 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20srm=20=E4=BF=AE=E6=94=B9=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../0004_alter_paperrecord_pa_type.py | 18 ++++++++++++++++++ apps/srm/models.py | 6 ++---- apps/srm/urls.py | 2 +- apps/srm/views.py | 2 +- 4 files changed, 22 insertions(+), 6 deletions(-) create mode 100644 apps/srm/migrations/0004_alter_paperrecord_pa_type.py diff --git a/apps/srm/migrations/0004_alter_paperrecord_pa_type.py b/apps/srm/migrations/0004_alter_paperrecord_pa_type.py new file mode 100644 index 00000000..1f3ac449 --- /dev/null +++ b/apps/srm/migrations/0004_alter_paperrecord_pa_type.py @@ -0,0 +1,18 @@ +# Generated by Django 3.2.12 on 2025-11-04 03:16 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('srm', '0003_paperrecord'), + ] + + operations = [ + migrations.AlterField( + model_name='paperrecord', + name='pa_type', + field=models.CharField(choices=[('research', '研究论文'), ('overview', '综述')], default='invention', max_length=50, verbose_name='论文类型'), + ), + ] diff --git a/apps/srm/models.py b/apps/srm/models.py index 56223b78..bf55da5f 100644 --- a/apps/srm/models.py +++ b/apps/srm/models.py @@ -84,9 +84,8 @@ class PatentRecord(CommonADModel): class PaperRecord(CommonADModel): """TN: 专利台账登记""" PAPER_TYPE_CHOICES = ( - ('invention', '发明专利'), - ('utility', '实用新型专利'), - ('design', '外观设计专利'), + ('research', '研究论文'), + ('overview', '综述'), ) paper_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="论文编号(投稿后补登)") paper = models.ForeignKey('Papersecret', verbose_name="论文名称", on_delete=models.CASCADE, related_name='paper_record') @@ -100,7 +99,6 @@ class PaperRecord(CommonADModel): public_date = models.DateField(null=True, blank=True, verbose_name="发表日期") # validity_years = models.IntegerField(null=True, blank=True, verbose_name="有效年限(年)") pub_paid = models.DecimalField(max_digits=10,decimal_places=2, null=True,blank=True,verbose_name="版面费缴纳") - status = models.CharField( max_length=20, choices=[ diff --git a/apps/srm/urls.py b/apps/srm/urls.py index 5efb09c5..8c686ddd 100644 --- a/apps/srm/urls.py +++ b/apps/srm/urls.py @@ -10,7 +10,7 @@ router = DefaultRouter() router.register('patentinfo', PatentInfoViewSet, basename='patentinfo') router.register('paperse', PapersecretViewSet, basename='PaperSe') router.register('patentrecord', PatentRecordViewSet, basename='patentrecord') -router.register('paperrecord', PaperRecordViewSet, basename='patentrecord') +router.register('paperrecord', PaperRecordViewSet, basename='paperrecord') urlpatterns = [ path(API_BASE_URL, include(router.urls)), diff --git a/apps/srm/views.py b/apps/srm/views.py index 7efc821b..95d919d1 100644 --- a/apps/srm/views.py +++ b/apps/srm/views.py @@ -90,5 +90,5 @@ class PaperRecordViewSet(CustomModelViewSet): queryset = Papersecret.objects.all() if search: queryset = queryset.filter(paper_name__icontains=search) - papers = [{'id': paper.id, 'name': paper.name} for paper in queryset] + papers = [{'id': paper.id, 'name': paper.paper_name} for paper in queryset] return Response(papers) \ No newline at end of file