xiugai

test_server/crm/migrations/0012_auto_20200402_2313.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-02 15:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('crm', '0011_consumer_workscope'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='company',
+            name='name',
+            field=models.CharField(max_length=60, verbose_name='名称'),
+        ),
+    ]

test_server/crm/models.py

@@ -5,11 +5,11 @@ from question.models import Questioncat, Question
 from examtest.models_paper import WorkScope
 # Create your models here.
 
-class Company(SoftCommonModel):
+class Company(CommonModel):
     '''
     客户企业
     '''
-    name = models.CharField(max_length=60, verbose_name='名称', unique=True)
+    name = models.CharField(max_length=60, verbose_name='名称')
     pid = models.ForeignKey('self', null=True, blank=True, on_delete=models.SET_NULL, verbose_name='父')
 
     class Meta:

test_server/examtest/migrations/0022_auto_20200402_2313.py

@@ -0,0 +1,17 @@
+# Generated by Django 3.0.4 on 2020-04-02 15:13
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('examtest', '0021_auto_20200401_1616'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='examtest',
+            options={'verbose_name': '模拟考试', 'verbose_name_plural': '模拟考试'},
+        ),
+    ]

test_server/question/migrations/0009_auto_20200402_2313.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.0.4 on 2020-04-02 15:13
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('question', '0008_auto_20200325_0959'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='questioncat',
+            name='name',
+            field=models.CharField(max_length=200, verbose_name='名称'),
+        ),
+    ]

test_server/question/models.py

@@ -1,15 +1,15 @@
 from django.db import models
-from rbac.models import SoftCommonModel
+from rbac.models import SoftCommonModel, CommonModel
 from django.contrib.postgres.fields import JSONField, ArrayField
 # Create your models here.
 
 
-class Questioncat(SoftCommonModel):
+class Questioncat(CommonModel):
     type_choices = (
         ('公共', '公共'),
         ('专业', '专业'),
     )
-    name = models.CharField(max_length=200, unique=True, verbose_name='名称')
+    name = models.CharField(max_length=200, verbose_name='名称')
     pid = models.ForeignKey('self', verbose_name='父', null=True, blank=True, on_delete=models.CASCADE, related_name='questioncatpid')
     is_subject = models.BooleanField(default=False, verbose_name='是否是学科')
     type = models.CharField(max_length=50, default='专业', choices=type_choices, verbose_name='科目类型')
@@ -39,7 +39,7 @@ class Question(SoftCommonModel):
     name = models.TextField(verbose_name='题干')
     type = models.CharField(max_length=50, default='单选', choices=type_choices, verbose_name='题型')
     level = models.CharField(max_length=50, default='低', choices=level_choices, verbose_name='难度')
-    questioncat = models.ForeignKey(Questioncat, blank=True, null=True, on_delete=models.CASCADE, verbose_name='所属题库', related_name='questioncat')
+    questioncat = models.ForeignKey(Questioncat, blank=True, null=True, on_delete=models.SET_NULL, verbose_name='所属题库', related_name='questioncat')
     options = JSONField(verbose_name='选项')
     right = JSONField(verbose_name='正确答案')
     resolution = models.TextField(verbose_name='解析')

test_server/question/views.py

@@ -50,7 +50,6 @@ class QuestioncatViewSet(ModelViewSet):
     filterset_fields = ['pid']
     search_fields = ['^name']
 
-
     @action(methods=['get'], detail=False,
             url_path='all', url_name='all_questioncat')
     def all(self, request):