diff --git a/safesite/daoru.py b/safesite/daoru.py index 5ad38647..4cdba4f6 100644 --- a/safesite/daoru.py +++ b/safesite/daoru.py @@ -84,11 +84,11 @@ def drquestions(companyid,path,userid): right = sheet['j'+str(i)].value.replace(' ', '') resolution = sheet['k'+str(i)].value level = sheet['l'+str(i)].value - objs = Questioncat.objects.filter(usecomp__partid=1,name=cate) + objs = Questioncat.objects.filter(usecomp__partid=1,name=cate,deletemark=1) if objs.exists(): cateobj = objs[0] else: - objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate) + objs = Questioncat.objects.filter(usecomp__partid=companyid,name=cate,deletemark=1) if objs.exists(): cateobj = objs[0] else: diff --git a/safesite/migrations/0322_auto_20200305_1411.py b/safesite/migrations/0322_auto_20200305_1411.py new file mode 100644 index 00000000..d9b1e2dc --- /dev/null +++ b/safesite/migrations/0322_auto_20200305_1411.py @@ -0,0 +1,27 @@ +# Generated by Django 2.2.8 on 2020-03-05 14:11 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('safesite', '0321_remove_companyinfo_liaison_fax'), + ] + + operations = [ + # migrations.RemoveField( + # model_name='companyinfo', + # name='liaison_fax', + # ), + migrations.AlterField( + model_name='examtestdetail', + name='tms', + field=models.TextField(default=','), + ), + migrations.AlterField( + model_name='examtestdetail', + name='wrongs', + field=models.TextField(default=','), + ), + ] diff --git a/safesite/models.py b/safesite/models.py index da2e1b1f..ff5b5d17 100644 --- a/safesite/models.py +++ b/safesite/models.py @@ -774,8 +774,8 @@ class ExamTestDetail(models.Model): # 考试详情表 passcode = models.IntegerField(default=0) # 是否通过 testdetail = JSONField(null=True, blank=True) score = models.FloatField(default=0) # 得分 - tms = models.CharField(max_length=10000, default=',') - wrongs = models.CharField(max_length=10000, default=',') + tms = models.TextField(default=',') + wrongs = models.TextField(default=',') class Train(models.Model): # 培训表