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() # 手动填充