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