From 9d4f6881300ad244d1ce054a6ed6fd09f5e2d6bd Mon Sep 17 00:00:00 2001 From: Administrator Date: Thu, 6 Jul 2023 15:13:19 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E6=AF=8F=E4=BA=BA=E6=97=A5?= =?UTF-8?q?=E6=8A=A5=E5=A1=AB=E5=86=99=E4=B8=BA=E4=B8=80=E6=AC=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Router/DailyRouter.py | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/Router/DailyRouter.py b/Router/DailyRouter.py index 5d52116..7ea3f30 100644 --- a/Router/DailyRouter.py +++ b/Router/DailyRouter.py @@ -8,7 +8,7 @@ from docx.oxml.ns import qn from docx.shared import Pt, Length, Inches from docxtpl import DocxTemplate from fastapi import APIRouter, Depends, HTTPException -from sqlalchemy import cast, DATE, func, or_ +from sqlalchemy import cast, DATE, func, or_, and_ from sqlalchemy.orm import Session from starlette.responses import FileResponse from docx import Document @@ -77,9 +77,15 @@ checker = SensitiveWordChecker(words) @router.post("/daily_add", response_model=DailySchemas.DailyAddRes, summary="添加日报") def daily_add(req: DailySchemas.DailyAddReq, db: Session = Depends(get_db), token_data: TokenData = Depends(token_data_depend)): - if db.query(Daily).filter( - Daily.type == DailyTypeEnum.部门子公司日报 and Daily.fill_user == token_data.email and cast(Daily.daily_time, - DATE) == datetime.date.today()): + # if db.query(Daily).filter( + # Daily.type == DailyTypeEnum.部门子公司日报 and Daily.fill_user == token_data.email and cast( + # Daily.daily_time, + # DATE) == datetime.date.today()).first(): + if req.type== DailyTypeEnum.部门子公司日报 and db.query(Daily).filter( + and_(Daily.type == DailyTypeEnum.部门子公司日报, Daily.fill_user == token_data.email), cast( + Daily.daily_time, + DATE) == datetime.date.today() + ).first(): raise HTTPException(detail="今日日报已提交，若需修改请在原日报上修改", status_code=305) if req.content: bad_words = [item[1] for item in checker.check(req.content)]