1

web/src/main/resources/sql/jlw/generalQuestionLog.md

@@ -1077,11 +1077,11 @@ studentScoreList
   @if(!isEmpty(generalQuestionSettingIdPlural)){
   and find_in_set(t.general_question_setting_id,#generalQuestionSettingIdPlural#)
   @}
-  @if(!isEmpty(resourcesQuestionSnapshotId)){
-  and t.resources_question_snapshot_id =#resourcesQuestionSnapshotId#
+  @if(!isEmpty(generalResourcesQuestionSnapshotId)){
+  and t.resources_question_snapshot_id =#generalResourcesQuestionSnapshotId#
   @}
-  @if(!isEmpty(resourcesQuestionSnapshotIdPlural)){
-  and find_in_set(t.resources_question_snapshot_id,#resourcesQuestionSnapshotIdPlural#)
+  @if(!isEmpty(generalResourcesQuestionSnapshotIdPlural)){
+  and find_in_set(t.resources_question_snapshot_id,#generalResourcesQuestionSnapshotIdPlural#)
   @}
   @if(!isEmpty(generalQuestionLogAnswer)){
   and t.general_question_log_answer =#generalQuestionLogAnswer#