From 96e8385524b085c9bfa310602d7581652c0bb026 Mon Sep 17 00:00:00 2001
From: zty <zty18395607196@163.com>
Date: Thu, 16 May 2024 18:59:24 +0800
Subject: [PATCH] =?UTF-8?q?fix=20:quai=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../0040_alter_qualification_change_date.py   | 20 +++++++++++++++++++
 server/apps/information/models.py             |  2 +-
 server/apps/information/serializers.py        |  2 +-
 server/apps/information/views.py              |  1 +
 4 files changed, 23 insertions(+), 2 deletions(-)
 create mode 100644 server/apps/information/migrations/0040_alter_qualification_change_date.py

diff --git a/server/apps/information/migrations/0040_alter_qualification_change_date.py b/server/apps/information/migrations/0040_alter_qualification_change_date.py
new file mode 100644
index 0000000..f35d0ae
--- /dev/null
+++ b/server/apps/information/migrations/0040_alter_qualification_change_date.py
@@ -0,0 +1,20 @@
+# Generated by Django 3.2.12 on 2024-05-16 10:58
+
+import datetime
+from django.db import migrations, models
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('information', '0039_alter_auditlog_change_reason'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='qualification',
+            name='change_date',
+            field=models.DateField(blank=True, default=datetime.datetime(2024, 5, 16, 10, 58, 55, 398970, tzinfo=utc), null=True, verbose_name='变更日期'),
+        ),
+    ]
diff --git a/server/apps/information/models.py b/server/apps/information/models.py
index 931784a..1742a4b 100644
--- a/server/apps/information/models.py
+++ b/server/apps/information/models.py
@@ -15,7 +15,7 @@ class Qualification(CommonBDModel):
     scope = models.TextField(verbose_name='资质范围', null=True, blank=True)
     number = models.IntegerField(verbose_name='参数数量', null=True, blank=True)
     cie_path = models.CharField(max_length=100, verbose_name='证书路径', null=True, blank=True)
-    change_date = models.DateField(verbose_name='变更日期', null=True, blank=True)
+    change_date = models.DateField(verbose_name='变更日期',default=timezone.now() ,null=True, blank=True)
         
     class Meta:
         verbose_name = '资质情况'
diff --git a/server/apps/information/serializers.py b/server/apps/information/serializers.py
index 84aab45..b92c990 100644
--- a/server/apps/information/serializers.py
+++ b/server/apps/information/serializers.py
@@ -38,7 +38,7 @@ class ExternalAuditorsSerializer(serializers.ModelSerializer):
 class QualificationSerializer(serializers.ModelSerializer):
     class Meta(BaseMeta):
         model = Qualification
-        fields = ["id","name","company_name","quali_type","org","org_date","expiration_date","number","scope", "change_date"]
+        fields = ["id","name","company_name","quali_type","org","org_date","expiration_date","number","scope"]
 
     def create(self, validated_data):
         validated_data["belong_dept_id"] = Organization.objects.filter(name = validated_data.get("company_name")).first().id
diff --git a/server/apps/information/views.py b/server/apps/information/views.py
index ceaa732..e8cc945 100644
--- a/server/apps/information/views.py
+++ b/server/apps/information/views.py
@@ -488,6 +488,7 @@ class QualiChangeViewSet(RbacFilterSet, CreateUpdateCustomMixin, ModelViewSet):
        #获取需要更新的实列
        instance = self.get_object()
        # 数据比较
+       print("--------",request.data)
        ignore_fields = ['create_by', 'create_time', 'update_date', 'id', 'change_reason']
        origin_dict = QualificationSerializer(instance=instance).data
        diff = []