From 7a6dc733f7effaee48288539ac2efa09c0c6c53b Mon Sep 17 00:00:00 2001 From: caoqianming Date: Thu, 26 Dec 2024 13:12:14 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20cal=5Fquastat=5Fsflog=20=E7=94=A8sflog.w?= =?UTF-8?q?ork=5Fdate=E8=BF=9B=E8=A1=8C=E6=8A=BD=E5=8F=96=E5=B9=B4?= =?UTF-8?q?=E6=9C=88=E6=97=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/qm/tasks.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/apps/qm/tasks.py b/apps/qm/tasks.py index 0bcd7a04..fb28aa6a 100644 --- a/apps/qm/tasks.py +++ b/apps/qm/tasks.py @@ -105,8 +105,8 @@ LEFT JOIN wpm_sflog sflog on sflog.id = qmq.sflog_id LEFT JOIN mtm_mgroup mgroup on mgroup.id = sflog.mgroup_id LEFT JOIN mtm_material mtma on mtma.id = qmq.material_id LEFT JOIN qm_testitem qmt on qmt.id = qmq.testitem_id -where EXTRACT(year from sflog.end_time) = {year_s} -and EXTRACT(month from sflog.end_time) = {month_s} and EXTRACT(day from sflog.end_time) = {day_s} +where EXTRACT(year from sflog.work_date) = {year_s} +and EXTRACT(month from sflog.work_date) = {month_s} and EXTRACT(day from sflog.work_date) = {day_s} and mgroup.id = '{mgroup.id}' and qmq.val_avg is not NULL and qmq.num_test is not NULL @@ -136,8 +136,8 @@ ORDER BY mgroup.sort, mtma.sort, qmt.sort LEFT JOIN mtm_team team on team.id = sflog.team_id LEFT JOIN mtm_material mtma on mtma.id = qmq.material_id LEFT JOIN qm_testitem qmt on qmt.id = qmq.testitem_id - where EXTRACT(year from sflog.end_time) = {year_s} - and EXTRACT(month from sflog.end_time) = {month_s} + where EXTRACT(year from sflog.work_date) = {year_s} + and EXTRACT(month from sflog.work_date) = {month_s} and team.id = '{team.id}' and qmq.val_avg is not NULL and qmq.num_test is not NULL @@ -166,8 +166,8 @@ LEFT JOIN wpm_sflog sflog on sflog.id = qmq.sflog_id LEFT JOIN mtm_mgroup mgroup on mgroup.id = sflog.mgroup_id LEFT JOIN mtm_material mtma on mtma.id = qmq.material_id LEFT JOIN qm_testitem qmt on qmt.id = qmq.testitem_id -where EXTRACT(year from sflog.end_time) = {year_s} -and EXTRACT(month from sflog.end_time) = {month_s} +where EXTRACT(year from sflog.work_date) = {year_s} +and EXTRACT(month from sflog.work_date) = {month_s} and mgroup.id = '{mgroup.id}' and qmq.val_avg is not NULL and qmq.num_test is not NULL @@ -196,7 +196,7 @@ LEFT JOIN wpm_sflog sflog on sflog.id = qmq.sflog_id LEFT JOIN mtm_mgroup mgroup on mgroup.id = sflog.mgroup_id LEFT JOIN mtm_material mtma on mtma.id = qmq.material_id LEFT JOIN qm_testitem qmt on qmt.id = qmq.testitem_id -where EXTRACT(year from sflog.end_time) = {year_s} +where EXTRACT(year from sflog.work_date) = {year_s} and mgroup.id = '{mgroup.id}' and qmq.val_avg is not NULL and qmq.num_test is not NULL