From a7b9386e79167cbc624c2ac81a0c8324034cf0b1 Mon Sep 17 00:00:00 2001 From: wuzilong <704541015@qq.com> Date: Wed, 18 Nov 2026 13:45:29 +0800 Subject: [PATCH] =?UTF-8?q?fix(pl):=20=E6=8A=A5=E5=BA=9F=E8=BD=A6=E5=92=8C?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E8=BD=A6=E4=B8=8D=E5=86=8D=E7=94=9F=E6=88=90?= =?UTF-8?q?=E8=AF=81=E4=BB=B6=E5=88=B0=E6=9C=9F=E6=8F=90=E9=86=92=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 扫描时跳过这两类车辆,并关闭已经存在的待提醒。 Co-authored-by: Cursor --- backend/app/services/pl_cert_service.py | 43 +++++++- backend/tests/test_pl_scan_cert_expiry.py | 114 ++++++++++++++++++++-- 2 files changed, 147 insertions(+), 10 deletions(-) diff --git a/backend/app/services/pl_cert_service.py b/backend/app/services/pl_cert_service.py index cbabc1e35..e41ad7832 100644 --- a/backend/app/services/pl_cert_service.py +++ b/backend/app/services/pl_cert_service.py @@ -252,8 +252,35 @@ def _resolve_pending_reminder( reminder.document_no = document_no +def _vehicle_reminder_skip_reason( + db: Session, cert: PlCert +) -> Optional[str]: + """报废车、三方(承运商)车不做人车证件到期提醒;返回关闭 remark。""" + if cert.owner_type != "vehicle" or not cert.owner_id: + return None + vehicle = ( + db.query(PlVehicle) + .filter( + PlVehicle.id == cert.owner_id, + PlVehicle.tenant_no == cert.tenant_no, + PlVehicle.del_flag == 0, + ) + .first() + ) + if not vehicle: + return None + if vehicle.vehicle_status == "scrapped": + return "系统自动关闭:车辆已报废,不再提醒" + if vehicle.vehicle_type == "carrier": + return "系统自动关闭:三方/承运商车辆不提醒" + return None + + def scan_cert_expiry(db: Session, tenant_no: Optional[str] = None, *, today: Optional[date] = None) -> int: - """扫描 pl_cert 生成到期提醒;退出提醒窗口或证件失效时关闭旧 pending。""" + """扫描 pl_cert 生成到期提醒;退出提醒窗口或证件失效时关闭旧 pending。 + + 报废车辆、三方(承运商)车辆的证件不提醒,并关闭已有 pending。 + """ today = today or date.today() query = db.query(PlCert).filter( PlCert.del_flag == 0, @@ -266,6 +293,20 @@ def scan_cert_expiry(db: Session, tenant_no: Optional[str] = None, *, today: Opt active_cert_ids: set[str] = set() created_count = 0 for cert in query.all(): + skip_reason = _vehicle_reminder_skip_reason(db, cert) + if skip_reason: + existing = _pending_reminder_for_cert(db, cert.id) + if existing: + _resolve_pending_reminder( + existing, + remark=skip_reason, + expire_date=cert.expire_date, + days_remaining=(cert.expire_date - today).days, + document_type=cert.cert_name, + document_no=cert.cert_no, + ) + continue + active_cert_ids.add(cert.id) days_remaining = (cert.expire_date - today).days existing = _pending_reminder_for_cert(db, cert.id) diff --git a/backend/tests/test_pl_scan_cert_expiry.py b/backend/tests/test_pl_scan_cert_expiry.py index 83904701c..299c7ae83 100644 --- a/backend/tests/test_pl_scan_cert_expiry.py +++ b/backend/tests/test_pl_scan_cert_expiry.py @@ -10,31 +10,43 @@ from app.models.pl_models import PlCert, PlDocumentReminder, PlVehicle from app.services.pl_cert_service import scan_cert_expiry -def _session(): +def _session(*, vehicles=None): engine = create_engine("sqlite://") PlCert.__table__.create(engine) PlDocumentReminder.__table__.create(engine) PlVehicle.__table__.create(engine) db = sessionmaker(bind=engine)() - db.add( - PlVehicle( + rows = vehicles or [ + dict( id="veh-1", vehicle_type="self", + vehicle_status="available", license_plate="皖LB1283", tenant_no="t1", create_dept_id="d1", ) - ) + ] + for row in rows: + db.add(PlVehicle(**row)) db.commit() return db -def _add_cert(db, *, cert_id: str, expire_date: date, remind_days: int = 30, del_flag: int = 0, status: str = "valid"): +def _add_cert( + db, + *, + cert_id: str, + expire_date: date, + remind_days: int = 30, + del_flag: int = 0, + status: str = "valid", + owner_id: str = "veh-1", +): db.add( PlCert( id=cert_id, owner_type="vehicle", - owner_id="veh-1", + owner_id=owner_id, cert_name="罐检报告", cert_no="皖R8440挂", expire_date=expire_date, @@ -47,14 +59,23 @@ def _add_cert(db, *, cert_id: str, expire_date: date, remind_days: int = 30, del ) -def _add_pending_reminder(db, *, rem_id: str, cert_id: str, expire_date: date, days_remaining: int): +def _add_pending_reminder( + db, + *, + rem_id: str, + cert_id: str, + expire_date: date, + days_remaining: int, + owner_id: str = "veh-1", + owner_label: str = "皖LB1283", +): db.add( PlDocumentReminder( id=rem_id, cert_id=cert_id, owner_type="vehicle", - owner_id="veh-1", - owner_label="皖LB1283", + owner_id=owner_id, + owner_label=owner_label, document_type="罐检报告", document_no="皖R8440挂", expire_date=expire_date, @@ -161,3 +182,78 @@ def test_scan_resolves_pending_when_cert_soft_deleted(): rem = db.query(PlDocumentReminder).filter_by(id="rem-gone").one() assert rem.status == "resolved" assert rem.remark and "失效" in rem.remark + + +def test_scan_skips_scrapped_vehicle_and_resolves_pending(): + db = _session( + vehicles=[ + dict( + id="veh-scrap", + vehicle_type="self", + vehicle_status="scrapped", + license_plate="皖H57837", + trailer_no="皖HE155挂", + tenant_no="t1", + create_dept_id="d1", + ) + ] + ) + today = date.today() + expire = today + timedelta(days=5) + _add_cert(db, cert_id="cert-scrap", expire_date=expire, owner_id="veh-scrap") + _add_pending_reminder( + db, + rem_id="rem-scrap", + cert_id="cert-scrap", + expire_date=expire, + days_remaining=5, + owner_id="veh-scrap", + owner_label="皖H57837", + ) + db.commit() + + created = scan_cert_expiry(db, tenant_no="t1") + db.commit() + + assert created == 0 + assert db.query(PlDocumentReminder).filter_by(cert_id="cert-scrap", status="pending").count() == 0 + rem = db.query(PlDocumentReminder).filter_by(id="rem-scrap").one() + assert rem.status == "resolved" + assert rem.remark and "报废" in rem.remark + + +def test_scan_skips_carrier_vehicle_and_resolves_pending(): + db = _session( + vehicles=[ + dict( + id="veh-carrier", + vehicle_type="carrier", + vehicle_status="available", + license_plate="皖HA1082", + tenant_no="t1", + create_dept_id="d1", + ) + ] + ) + today = date.today() + expire = today + timedelta(days=5) + _add_cert(db, cert_id="cert-carrier", expire_date=expire, owner_id="veh-carrier") + _add_pending_reminder( + db, + rem_id="rem-carrier", + cert_id="cert-carrier", + expire_date=expire, + days_remaining=5, + owner_id="veh-carrier", + owner_label="皖HA1082", + ) + db.commit() + + created = scan_cert_expiry(db, tenant_no="t1") + db.commit() + + assert created == 0 + assert db.query(PlDocumentReminder).filter_by(cert_id="cert-carrier", status="pending").count() == 0 + rem = db.query(PlDocumentReminder).filter_by(id="rem-carrier").one() + assert rem.status == "resolved" + assert rem.remark and ("三方" in rem.remark or "承运" in rem.remark)