Merge remote-tracking branch 'origin/dev' into dev

snowy-plugin/snowy-plugin-disk/snowy-plugin-disk-func/src/main/java/vip/xiaonuo/disk/mapper/mapping/QuestionAnswerMapper.xml

@@ -42,6 +42,7 @@
             IFNULL(cqa.PID,'') AS pid,
             IFNULL(cqa.INFO,'') AS info,
             IFNULL(cqa.GIVE_NUM ,'') AS giveNum,
+            IFNULL(cqa.CREATE_TIME,'') AS createTime,
             IFNULL(cqa.COURSE_ID,'') AS courseId,
             IFNULL(ci.COURSE_NAME,'') AS courseIdName,
             IFNULL(cqa.RECORD_TIME,'') AS recordTime,
@@ -50,12 +51,15 @@
             IFNULL(cqa.USER_ID,'') AS userId,
             IFNULL(su.NAME,'') AS userIdName,
             IFNULL(cr.MAIN_ID ,'') AS hourId,
-            IFNULL(cc.NAME,'') AS hourIdName
+            IFNULL(cc.NAME,'') AS hourIdName,
+            IFNULL (su.GRADES_ID,'') AS gradesId,
+            IFNULL (gr.grades_name,'') AS gradesIdName
         FROM COURSE_QUESTION_ANSWER cqa
         LEFT JOIN COURSE_INFO ci ON ci.COURSE_ID = cqa.COURSE_ID AND ci.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN COURSE_RELATE cr ON cr.RELATE_ID =cqa.ID AND cr.FUNC_TYPE ='7' AND cr.INFO_TYPE ='1' AND cr.CHAPTERHOUR_TYPE ='1'
         LEFT JOIN COURSE_CLASSHOUR cc ON cc.ID = cr.MAIN_ID AND cc.DELETE_FLAG ='NOT_DELETE'
         LEFT JOIN SYS_USER su ON su.ID=cqa.USER_ID AND su.DELETE_FLAG ='NOT_DELETE'
+        LEFT JOIN grades gr ON su.GRADES_ID =gr.grades_id  AND gr.DELETE_FLAG ='NOT_DELETE'
         WHERE cqa.DELETE_FLAG ='NOT_DELETE'
         <if test="param.isPid !=null and param.isPid != ''">
             <if test="param.isPid ==1">