From 1b2f201786030a5acb932a11998af58be9bfbc3f Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Thu, 6 Feb 2025 09:21:20 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E5=85=A5=E5=8E=82=E5=92=8C=E4=BD=9C?=
 =?UTF-8?q?=E4=B8=9A=E6=97=B6=E8=BF=9B=E8=A1=8C=E8=AF=81=E4=B9=A6=E8=BF=87?=
 =?UTF-8?q?=E6=9C=9F=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/opm/serializers.py | 4 ++++
 apps/rpm/services.py    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/apps/opm/serializers.py b/apps/opm/serializers.py
index ab3f27c8..fe6dff65 100644
--- a/apps/opm/serializers.py
+++ b/apps/opm/serializers.py
@@ -107,6 +107,8 @@ class OplWorkerCreateSerializer(CustomModelSerializer):
         with transaction.atomic():
             oplw = super().create(validated_data)
             for x in certificates:
+                if x.state == Certificate.CERT_EXPIRED:
+                    raise ParseError(f'证书{x.number}已过期!')
                 oplc = OplCert.objects.filter(opl_worker=oplw, certificate=x).first()
                 if oplc:
                     pass
@@ -133,6 +135,8 @@ class OplWorkerUpdateSerializer(CustomModelSerializer):
         with transaction.atomic():
             oplw = super().update(instance, validated_data)
             for x in certificates:
+                if x.state == Certificate.CERT_EXPIRED:
+                    raise ParseError(f'证书{x.number}已过期!')
                 oplc = OplCert.objects.filter(opl_worker=oplw, certificate=x).first()
                 if oplc:
                     pass
diff --git a/apps/rpm/services.py b/apps/rpm/services.py
index eb5c9037..60e139dc 100644
--- a/apps/rpm/services.py
+++ b/apps/rpm/services.py
@@ -196,6 +196,7 @@ def rpj_certificate_in(rpjm: Rpjmember):
         ct.expiration_date = i.expiration_date
         ct.review_date = i.review_date
         ct.file = i.file
+        ct.state = ct.get_state()
         ct.save()
 
 
@@ -219,6 +220,7 @@ def rpj_audit_end(ticket):
         ct.expiration_date = i.expiration_date
         ct.review_date = i.review_date
         ct.file = i.file
+        ct.state = ct.get_state()
         ct.save()
     # 更新相关方资料库后续可从资料库里选择
     for i in Rpjfile.objects.filter(rpj=rpj):