From c57c426daa2a0d29144e8b189313204e1686b042 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E5=89=8D=E6=98=8E?= <909355014@qq.com>
Date: Thu, 25 Aug 2022 10:06:22 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9A=E6=97=B6=E5=85=B3=E9=97=AD=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3=E6=96=B9=E5=85=A5=E5=8E=82=E5=92=8C=E8=AE=BF=E5=AE=A2?=
 =?UTF-8?q?=E5=85=A5=E5=8E=82=E9=A1=B9=E7=9B=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/rpm/tasks.py | 2 +-
 apps/vm/tasks.py  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/rpm/tasks.py b/apps/rpm/tasks.py
index 8c243683..4401ceb5 100644
--- a/apps/rpm/tasks.py
+++ b/apps/rpm/tasks.py
@@ -13,7 +13,7 @@ def close_rpj_by_leave_time():
     """
     now = timezone.now()
     # 正常结束/其他关闭
-    rpjs = Rpj.objects.filter(leave_time__lt=now)
+    rpjs = Rpj.objects.filter(leave_time__lt=now).exclude(state__in=[Rpj.RPJ_DONE, Rpj.RPJ_CLOSE])
     for i in rpjs:
         if i.state == Rpj.RPJ_WORKING:
             i.state = Rpj.RPJ_DONE
diff --git a/apps/vm/tasks.py b/apps/vm/tasks.py
index 9469f926..f46ae2ff 100644
--- a/apps/vm/tasks.py
+++ b/apps/vm/tasks.py
@@ -13,7 +13,7 @@ def close_visit_by_leave_time():
     """
     now = timezone.now()
     # 正常结束/其他关闭
-    vs = Visit.objects.filter(leave_time__lt=now)
+    vs = Visit.objects.filter(leave_time__lt=now).exclude(state__in=[Visit.V_DONE, Visit.V_CLOSE])
     for i in vs:
         if i.state == Visit.V_WORKING:
             i.state = Visit.V_DONE