孙向锦 / SunvoteEducation

Commit 9b7b8b9b2e7ac0d50e1af9a344fff62aba9f9d5d

Authored by jack
2 parents 9eab9def 6d78f08d

Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

Inline Side-by-side
Showing 1 changed file with 5 additions and 0 deletions
resources/mybatis1/sunvote/HomeworkMapper.xml
  View file @9b7b8b9
@@ -28,6 +28,7 @@ @@ -28,6 +28,7 @@
28 GET_SCORE_PERSENT, 28 GET_SCORE_PERSENT,
29 GET_MAX_SCORE, 29 GET_MAX_SCORE,
30 QUESTION_COUNT, 30 QUESTION_COUNT,
  31 + ANSWER_PERSENT,
31 HOMEWORK_ID 32 HOMEWORK_ID
32 </sql> 33 </sql>
33 34
@@ -52,6 +53,7 @@ @@ -52,6 +53,7 @@
52 #{GET_SCORE_PERSENT}, 53 #{GET_SCORE_PERSENT},
53 #{GET_MAX_SCORE}, 54 #{GET_MAX_SCORE},
54 #{QUESTION_COUNT}, 55 #{QUESTION_COUNT},
  56 + #{ANSWER_PERSENT},
55 #{HOMEWORK_ID} 57 #{HOMEWORK_ID}
56 </sql> 58 </sql>
57 59
@@ -117,6 +119,8 @@ @@ -117,6 +119,8 @@
117 GET_MAX_SCORE = #{GET_MAX_SCORE}, 119 GET_MAX_SCORE = #{GET_MAX_SCORE},
118 </if><if test="QUESTION_COUNT != null and QUESTION_COUNT != ''"> 120 </if><if test="QUESTION_COUNT != null and QUESTION_COUNT != ''">
119 QUESTION_COUNT = #{QUESTION_COUNT}, 121 QUESTION_COUNT = #{QUESTION_COUNT},
  122 + </if><if test="ANSWER_PERSENT != null and ANSWER_PERSENT != ''">
  123 + ANSWER_PERSENT = #{ANSWER_PERSENT},
120 </if> 124 </if>
121 HOMEWORK_ID = HOMEWORK_ID 125 HOMEWORK_ID = HOMEWORK_ID
122 where 126 where
@@ -288,6 +292,7 @@ @@ -288,6 +292,7 @@
288 SELECT 292 SELECT
289 sv_homeworkreport.STUDENT_ID, 293 sv_homeworkreport.STUDENT_ID,
290 sv_homeworkreport.ANSWER, 294 sv_homeworkreport.ANSWER,
  295 + sv_homeworkreport.RANK,
291 sv_homeworkreport.STUDENT_NAME, 296 sv_homeworkreport.STUDENT_NAME,
292 sv_homework.ALL_SCORE as PAPER_SCORE, 297 sv_homework.ALL_SCORE as PAPER_SCORE,
293 sv_homework.GET_SCORE as AVG_SCORE, 298 sv_homework.GET_SCORE as AVG_SCORE,