Merge branch 'master' of http://gitea.xxhhcty.xyz:8080/zcdsj/factory

apps/srm/migrations/0010_alter_paperrecord_cor_author.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2025-11-25 08:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('srm', '0009_auto_20251125_1616'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='paperrecord',
+            name='cor_author',
+            field=models.CharField(blank=True, max_length=100, null=True, verbose_name='通讯作者'),
+        ),
+    ]

apps/srm/migrations/0011_auto_20251125_1637.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.12 on 2025-11-25 08:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('srm', '0010_alter_paperrecord_cor_author'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='papersecret',
+            name='organization',
+            field=models.CharField(default='CE', max_length=100, verbose_name='申请部门'),
+            preserve_default=False,
+        ),
+        migrations.AlterField(
+            model_name='patentrecord',
+            name='organization',
+            field=models.CharField(max_length=100, verbose_name='申请部门'),
+        ),
+    ]

apps/srm/models.py

@@ -37,6 +37,7 @@ class Papersecret(CommonBDModel):
     paper_name = models.CharField('拟发表论文名称', max_length=100)
     publication_name = models.CharField('拟投期刊名称', max_length=100)
     author = models.CharField('作者', max_length=100)
+    organization = models.CharField(max_length=100, verbose_name="申请部门")
     paper_type = models.CharField('拟发表文章类型', max_length=100)
     is_chinese_core = models.BooleanField('是否为中文核心', default=False)
     is_sci = models.BooleanField('是否被SCI/EI收录', default=False)
@@ -56,7 +57,7 @@ class PatentRecord(CommonADModel):
     application_number = models.CharField(max_length=50, null=True, blank=True, verbose_name="申请号（交局后补登）")
     patent = models.ForeignKey('PatentInfo', verbose_name="专利名称", on_delete=models.CASCADE, related_name='patent_record')
     pc_type = models.CharField('专利类型', max_length=50, choices=PATENT_TYPE_CHOICES, default='invention')
-    organization = models.CharField(max_length=100, verbose_name="单位")
+    organization = models.CharField(max_length=100, verbose_name="申请部门")
     inventors = models.CharField(max_length=255, verbose_name="发明人")
     agent = models.CharField(max_length=255, null=True, blank=True, verbose_name="代理人")
     affiliated_platforms = models.CharField(max_length=255, blank=True, verbose_name="归属平台")
@@ -95,7 +96,7 @@ class PaperRecord(CommonADModel):
     pa_type = models.CharField('论文类型', max_length=50, choices=PAPER_TYPE_CHOICES, default='invention')
     organization = models.CharField(max_length=100, verbose_name="申请部门")
     author = models.CharField(max_length=100, verbose_name="作者")
-    cor_author = models.CharField(max_length=100, verbose_name="通讯作者")
+    cor_author = models.CharField(max_length=100, null=True, blank=True, verbose_name="通讯作者")
     affiliated_platforms = models.CharField(max_length=255, blank=True, verbose_name="归属平台")
     affiliated_projects = models.CharField(max_length=255, blank=True, verbose_name="归属项目")
     accept_date = models.DateField(null=True, blank=True, verbose_name="接受日期")