From d5e17f160f974a037867742b0ae831f1f9ec8d4f Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Wed, 7 Aug 2024 16:15:03 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=B9=E4=BA=8E=E6=B2=A1=E6=9C=89=E5=9B=BE?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E6=A1=88=E5=AD=90=EF=BC=88=E7=85=A7=E7=89=87?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=87=BA=E7=8E=B0=E9=97=AE=E9=A2=98=EF=BC=89?=
 =?UTF-8?q?=E4=B8=8D=E5=86=8D=E5=81=9A=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 photo_mask/photo_mask.py     | 8 +++++---
 photo_review/photo_review.py | 6 +++++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/photo_mask/photo_mask.py b/photo_mask/photo_mask.py
index ecbbe90..642d16b 100644
--- a/photo_mask/photo_mask.py
+++ b/photo_mask/photo_mask.py
@@ -245,9 +245,11 @@ def photo_mask(pk_phhd, name, id_card_num):
 def main():
     while 1:
         session = MysqlSession()
-        phhds = session.query(ZxPhhd.pk_phhd, ZxPhhd.cXm, ZxPhhd.cSfzh).filter(
-            ZxPhhd.paint_flag == "1"
-        ).limit(PHHD_BATCH_SIZE).all()
+        phhds = (session.query(ZxPhhd.pk_phhd, ZxPhhd.cXm, ZxPhhd.cSfzh)
+                 .join(ZxPhrec, ZxPhhd.pk_phhd == ZxPhrec.pk_phhd, isouter=True)
+                 .filter(ZxPhhd.paint_flag == "1")
+                 .filter(ZxPhrec.pk_phrec.isnot(None))
+                 .distinct().limit(PHHD_BATCH_SIZE).all())
         # 将状态改为正在涂抹中
         pk_phhd_values = [phhd.pk_phhd for phhd in phhds]
         update_flag = (update(ZxPhhd).where(ZxPhhd.pk_phhd.in_(pk_phhd_values)).values(paint_flag="2"))
diff --git a/photo_review/photo_review.py b/photo_review/photo_review.py
index 2daff95..b6ffe2f 100644
--- a/photo_review/photo_review.py
+++ b/photo_review/photo_review.py
@@ -278,7 +278,11 @@ def photo_review(pk_phhd):
 def main():
     while 1:
         session = MysqlSession()
-        phhds = session.query(ZxPhhd.pk_phhd).filter(ZxPhhd.exsuccess_flag == '1').limit(PHHD_BATCH_SIZE).all()
+        phhds = (session.query(ZxPhhd.pk_phhd)
+                 .join(ZxPhrec, ZxPhhd.pk_phhd == ZxPhrec.pk_phhd, isouter=True)
+                 .filter(ZxPhhd.exsuccess_flag == "1")
+                 .filter(ZxPhrec.pk_phrec.isnot(None))
+                 .distinct().limit(PHHD_BATCH_SIZE).all())
         # 将状态改为正在识别中
         pk_phhd_values = [phhd.pk_phhd for phhd in phhds]
         update_flag = (update(ZxPhhd).where(ZxPhhd.pk_phhd.in_(pk_phhd_values)).values(exsuccess_flag=2))