From 6fd5c059c22a58fd96ec477d016d501adc7717a3 Mon Sep 17 00:00:00 2001
From: liuyebo <1515783401@qq.com>
Date: Fri, 9 Aug 2024 16:37:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BA=E6=B6=82=E6=8A=B9=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=88=86=E6=9E=90=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E9=99=90?=
 =?UTF-8?q?=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 docker-compose.yml              | 2 +-
 photo_mask_batch_error_check.py | 9 ++++++++-
 photo_mask_error_check.py       | 7 +++++--
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index f21f875..2946f81 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -1,6 +1,6 @@
 x-env:
   &default-image
-  image: fcb_photo_review:1.10.2
+  image: fcb_photo_review:1.10.3
 
 services:
   photo_review_1:
diff --git a/photo_mask_batch_error_check.py b/photo_mask_batch_error_check.py
index 04796b5..f4c4222 100644
--- a/photo_mask_batch_error_check.py
+++ b/photo_mask_batch_error_check.py
@@ -1,14 +1,21 @@
+from datetime import date, timedelta
+
 import cv2
+from sqlalchemy import and_
 
 from db import MysqlSession
 from db.mysql import ZxIeOcrerror
 from photo_mask_error_check import check_error
 
 if __name__ == '__main__':
+    today = date.today()
     session = MysqlSession()
     # 对涂抹错误的进行测试比较
     ocr_errors = (session.query(ZxIeOcrerror.pk_phrec, ZxIeOcrerror.cXm, ZxIeOcrerror.cSfzh, ZxIeOcrerror.cfjaddress)
-                  .filter(ZxIeOcrerror.checktime.is_(None)).order_by(ZxIeOcrerror.pk_phrec.desc()).limit(50).all())
+                  .filter(and_(ZxIeOcrerror.checktime.is_(None),
+                               ZxIeOcrerror.creationtime >= today,
+                               ZxIeOcrerror.creationtime < today + timedelta(days=1)))
+                  .order_by(ZxIeOcrerror.pk_phrec.desc()).limit(50).all())
 
     # 对已涂抹的进行测试比较
     # ocr_errors = (session.query(ZxPhrec.pk_phrec, ZxPhhd.cXm, ZxPhhd.cSfzh, ZxPhrec.cfjaddress)
diff --git a/photo_mask_error_check.py b/photo_mask_error_check.py
index 5c3ae66..012b62e 100644
--- a/photo_mask_error_check.py
+++ b/photo_mask_error_check.py
@@ -1,5 +1,5 @@
 import sys
-from datetime import date
+from datetime import date, timedelta
 
 import cv2
 from sqlalchemy import update, and_, select, exists
@@ -48,10 +48,13 @@ def auto_check_error(error_ocr):
 
 if __name__ == '__main__':
     # 默认
+    today = date.today()
     session = MysqlSession()
     ocr_error = (session.query(ZxIeOcrerror.pk_phrec, ZxIeOcrerror.cXm, ZxIeOcrerror.cSfzh, ZxIeOcrerror.cfjaddress,
                                ZxIeOcrerror.cfjaddress2)
-                 .filter(and_(ZxIeOcrerror.checktime.is_(None), ZxIeOcrerror.paint_date >= date.today()))
+                 .filter(and_(ZxIeOcrerror.checktime.is_(None),
+                              ZxIeOcrerror.creationtime >= today,
+                              ZxIeOcrerror.creationtime < today + timedelta(days=1)))
                  .limit(1).one())
     session.close()
     # 手动填充