Merge branch 'master' of https://e.coding.net/ctcdevteam/cma_search

server/apps/consulting/migrations/0008_auto_20231204_0931.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.12 on 2023-12-04 01:31
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('consulting', '0007_auto_20230821_1458'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='policy',
+            name='month',
+            field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='月份'),
+        ),
+        migrations.AddField(
+            model_name='policy',
+            name='year',
+            field=models.PositiveSmallIntegerField(blank=True, null=True, verbose_name='年份'),
+        ),
+    ]

server/apps/consulting/models.py

@@ -37,8 +37,11 @@ class Professional(CommonAModel):
     class Meta:
         verbose_name = '专业领域要求'
         verbose_name_plural = verbose_name
+
 class Policy(CommonAModel):
     cate = models.CharField('分类', max_length=100, default='政策')
+    year = models.PositiveSmallIntegerField('年份', null=True, blank=True)
+    month = models.PositiveSmallIntegerField('月份', null=True, blank=True)
     name = models.CharField('名称', max_length=100)
     description = models.TextField('描述', default="", blank=True)
     file = models.ForeignKey(File, on_delete=models.CASCADE)

server/apps/consulting/views.py

@@ -43,7 +43,7 @@ class PolicyViewSet(OptimizationMixin, PageOrNot, CreateUpdateModelAMixin, Model
                  'put': 'policy_update', 'delete': 'policy_delete'}
     queryset = Policy.objects.all()
     serializer_class = PolicySerializer
-    filterset_fields = ['cate', 'name']
+    filterset_fields = ['cate', 'name', 'year', 'month']
     search_fields = ['cate', 'name', 'description']
     ordering = ['-id']
 

server/apps/supervision/serializers.py

@@ -187,12 +187,13 @@ class RcSerializer(ValidateMixin, serializers.ModelSerializer):
     # date_issue = DateField(required=False, allow_null=True)
     # date_accept = DateField(required=False, allow_null=True)
     # date_expect = DateField(required=False, allow_null=True)
+    belong_dept_name = serializers.CharField(source='task2do.belong_dept.name', read_only=True)
     class Meta(BaseMeta):
         model = Rc
 
 
 class ComplaintSerializer(ValidateMixin, serializers.ModelSerializer):
-
+    belong_dept_name = serializers.CharField(source='task2do.belong_dept.name', read_only=True)
     # date_occurrence = DateField()
     # date_feedback = DateField()
     class Meta(BaseMeta):
@@ -204,11 +205,12 @@ class PtSerializer(ValidateMixin, serializers.ModelSerializer):
         model = Pt
 
 class RiskSerializer(ValidateMixin, serializers.ModelSerializer):
-
+    belong_dept_name = serializers.CharField(source='task2do.belong_dept.name', read_only=True)
     class Meta(BaseMeta):
         model = Risk
 
 class OinspectSerializer(ValidateMixin, serializers.ModelSerializer):
+    belong_dept_name = serializers.CharField(source='task2do.belong_dept.name', read_only=True)
     # date_inspect = DateField()
     class Meta(BaseMeta):
         model = Oinspect