孙向锦 / SunvoteEducation

Commit 976f79c0425de27b894731ba739943f57f4fad36

Authored by jack
2 parents 1c3b4f8d d4d5b6a2

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

Inline Side-by-side
Showing 3 changed files with 28 additions and 0 deletions
resources/mybatis1/sunvote/HomeworkReportMapper.xml
  View file @976f79c
... ... @@ -17,6 +17,7 @@
17 17 RIGHT_PERSENT,
18 18 GET_SCORE,
19 19 ANSWER,
  20 + WHETHER,
20 21 HOMEWORK_ID
21 22 </sql>
22 23  
... ... @@ -30,6 +31,7 @@
30 31 #{RIGHT_PERSENT},
31 32 #{GET_SCORE},
32 33 #{ANSWER},
  34 + #{WHETHER},
33 35 #{HOMEWORK_ID}
34 36 </sql>
35 37  
... ... @@ -64,6 +66,7 @@
64 66 RIGHT_PERSENT = #{RIGHT_PERSENT},
65 67 GET_SCORE = #{GET_SCORE},
66 68 ANSWER = #{ANSWER},
  69 + WHETHER = #{WHETHER},
67 70 HOMEWORK_ID = #{HOMEWORK_ID}
68 71 where
69 72 HOMEWORK_REPORT_ID = #{HOMEWORK_REPORT_ID}
... ... @@ -167,6 +170,7 @@
167 170 #{item.GET_SCORE},
168 171 #{item.ANSWER},
169 172 #{item.HOMEWORK_ID}
  173 + #{item.WHETHER}
170 174 )
171 175 </foreach>
172 176 </insert>
... ...
src/com/fh/bean/ResultHomework.java
  View file @976f79c
... ... @@ -12,6 +12,7 @@ public class ResultHomework {
12 12 private String GET_SCORE_PERSENT;
13 13 private String COMPLETE_DESC;
14 14 private String GET_MAX_SCORE;
  15 + private String ANSWER_PERSENT;
15 16 private List<ResultStudent> STUDENTS;
16 17  
17 18 public void setHOMEWORK_ID(String HOMEWORK_ID) {
... ... @@ -70,6 +71,16 @@ public class ResultHomework {
70 71 return STUDENTS;
71 72 }
72 73  
  74 +
  75 +
  76 + public String getANSWER_PERSENT() {
  77 + return ANSWER_PERSENT;
  78 + }
  79 +
  80 + public void setANSWER_PERSENT(String aNSWER_PERSENT) {
  81 + ANSWER_PERSENT = aNSWER_PERSENT;
  82 + }
  83 +
73 84 public static ResultHomework parse(String json){
74 85 Gson gson = new Gson();
75 86 return gson.fromJson(json, ResultHomework.class);
... ... @@ -77,6 +88,15 @@ public class ResultHomework {
77 88  
78 89 public static class ResultStudent {
79 90 private String STUDENT_NO;
  91 + private String STUDENT_ID;
  92 + public String getSTUDENT_ID() {
  93 + return STUDENT_ID;
  94 + }
  95 +
  96 + public void setSTUDENT_ID(String sTUDENT_ID) {
  97 + STUDENT_ID = sTUDENT_ID;
  98 + }
  99 +
80 100 private String STUDENT_NAME;
81 101 private String KEYBOARD;
82 102 private String RIGHT_PERSENT;
... ...
src/com/fh/controller/api/V1.java
  View file @976f79c
... ... @@ -2895,6 +2895,7 @@ public class V1 extends BaseController {
2895 2895 homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
2896 2896 homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
2897 2897 homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
  2898 + homePd.put("ANSWER_PERSENT", resultHomework.getANSWER_PERSENT());
2898 2899 homePd.put("COMPLETE_COUNT", "1");
2899 2900 homeworkService.edit(homePd);
2900 2901 List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
... ... @@ -2911,6 +2912,7 @@ public class V1 extends BaseController {
2911 2912 ptd.put("RIGHT_PERSENT", "0%");
2912 2913 ptd.put("GET_SCORE", "0");
2913 2914 ptd.put("ANSWER", "");
  2915 + ptd.put("WHETHER", "0");
2914 2916 ptd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
2915 2917 }
2916 2918 // 2. 根据学生列表生成初始化成绩
... ... @@ -2924,12 +2926,14 @@ public class V1 extends BaseController {
2924 2926 PageData tpd = new PageData();
2925 2927 tpd.put("STUDENT_NAME", student.getSTUDENT_NAME());
2926 2928 tpd.put("STUDENT_NO", student.getSTUDENT_NO());
  2929 + tpd.put("STUDENT_ID", student.getSTUDENT_ID());
2927 2930 tpd.put("RANK", student.getRANK());
2928 2931 tpd.put("KEYBOARD", student.getKEYBOARD());
2929 2932 tpd.put("RIGHT_PERSENT", student.getRIGHT_PERSENT());
2930 2933 tpd.put("GET_SCORE", student.getGET_SCORE());
2931 2934 tpd.put("ANSWER", student.getANSWER());
2932 2935 tpd.put("HOMEWORK_ID", resultHomework.getHOMEWORK_ID());
  2936 + tpd.put("WHETHER", "1");
2933 2937 homeworkReporkService.update(tpd);
2934 2938 }
2935 2939 res.setData(resultHomework.getHOMEWORK_ID());
... ...