From c9c9d136a16a65c84505d1baf13d54be5cfaab02 Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Mon, 22 May 2023 15:20:24 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=BA=93task2=20default?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../migrations/0040_auto_20230522_1515.py      | 18 ++++++++++++++++++
 .../migrations/0041_auto_20230522_1518.py      | 18 ++++++++++++++++++
 server/apps/supervision/models.py              |  4 ++--
 3 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 server/apps/supervision/migrations/0040_auto_20230522_1515.py
 create mode 100644 server/apps/supervision/migrations/0041_auto_20230522_1518.py

diff --git a/server/apps/supervision/migrations/0040_auto_20230522_1515.py b/server/apps/supervision/migrations/0040_auto_20230522_1515.py
new file mode 100644
index 0000000..286be76
--- /dev/null
+++ b/server/apps/supervision/migrations/0040_auto_20230522_1515.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2023-05-22 07:15
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0039_auto_20230517_1419'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='task2',
+            name='state',
+            field=models.PositiveSmallIntegerField(choices=[(10, '创建中'), (20, '进行中'), (30, '已关闭')], default=10, verbose_name='任务状态'),
+        ),
+    ]
diff --git a/server/apps/supervision/migrations/0041_auto_20230522_1518.py b/server/apps/supervision/migrations/0041_auto_20230522_1518.py
new file mode 100644
index 0000000..2b7ee81
--- /dev/null
+++ b/server/apps/supervision/migrations/0041_auto_20230522_1518.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.0.5 on 2023-05-22 07:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('supervision', '0040_auto_20230522_1515'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='task2',
+            name='cycle',
+            field=models.PositiveSmallIntegerField(blank=True, default=0, help_text='1-6个周期', verbose_name='所属周期'),
+        ),
+    ]
diff --git a/server/apps/supervision/models.py b/server/apps/supervision/models.py
index 6b3dd7f..86ab03f 100644
--- a/server/apps/supervision/models.py
+++ b/server/apps/supervision/models.py
@@ -157,9 +157,9 @@ class Task2(CommonAModel):
     )
 
     year = models.PositiveSmallIntegerField('年份', default=2023)
-    cycle = models.PositiveSmallIntegerField('所属周期', default=0, help_text='1-6个周期')
+    cycle = models.PositiveSmallIntegerField('所属周期', default=0, help_text='1-6个周期', blank=True)
     type = models.PositiveSmallIntegerField('任务类型', choices=TASK2_TYPES, default=20)
-    state = models.PositiveSmallIntegerField('任务状态', choices=TASK2_STATES, default=20)
+    state = models.PositiveSmallIntegerField('任务状态', choices=TASK2_STATES, default=10)
     depts = models.ManyToManyField(Organization, verbose_name='执行公司', through='supervision.task2do', blank=True)