diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp index 30d5d4d..f45859a 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_item_report.jsp @@ -64,8 +64,8 @@
键盘
正确率
得分
- - + +
题目${vs.index+1}
 @@ -84,9 +84,10 @@
${var.KEYPAD_ID}
%
${pd.DATA[vs.index].STUDENT_SCORE}
- - - + + + + style="background:#0bb8b9">
${ANSWER1[0]==""?"--":ANSWER1[0]}
 diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp index 76d708e..b44915c 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp @@ -120,7 +120,7 @@
-
+
style="display:none;">
diff --git a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp index 804f4c6..42bca75 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/homework/homework_view.jsp @@ -138,7 +138,7 @@
-
+
退出 diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp index 2150852..2c6c061 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/en_teacher_main.jsp @@ -48,11 +48,13 @@

Welcome！

-

${pd.TEACHER[0].TEACHER_NAME }

-

${pd.TEACHER[0].SCHOOL_NAME }

+

${pd.TEACHER.TNAME }

+

${pd.TEACHER.SNAME }

-
+


+ + <%--

Classes

@@ -61,49 +63,51 @@

  • ${var.CLASS_NAME} ${var.SUBJECT_ENAME}

    • - + -
    +
    --%>
    -

    Test Papers

    +

    E-Test

    • -

      E-exam Papers

      +

      Papers

      • -
    • -

      E-class Papers

      - - +
    • +

      Tests

      +
        + +

      • Result of ${var.CLASS_NAME} +

        • +         +
      • +

    - Result Analysis + E-class

      -
    • -

      E-exam Tests

      -
        - -

      • Result of ${var.CLASS_NAME}

        • -         -
      +
    • +

      Papers

      + +
    • -

      E-class Tests

      +

      Tests

        - +

      • Result of ${var.CLASS_NAME}

        •
      diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml index 4b41fe9..1caa796 100644 --- a/resources/mybatis1/api/V1Mapper.xml +++ b/resources/mybatis1/api/V1Mapper.xml @@ -298,7 +298,6 @@ (sv_student.NUMBER * 1), sv_studenttest.STUDENT_ID, sv_testpaper.CREATE_DATE - limit 0,20 diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml index 8cb40fa..f9f8452 100644 --- a/resources/mybatis1/sunvote/HomeworkMapper.xml +++ b/resources/mybatis1/sunvote/HomeworkMapper.xml @@ -266,6 +266,10 @@ ALL_SCORE, QUESTION_COUNT, COMPLETE_DESC, + ANSWER_PERSENT, + GET_MAX_SCORE, + GET_SCORE, + GET_SCORE_PERSENT, HOMEWORK_ID from diff --git a/resources/mybatis1/sunvote/HomeworkReportMapper.xml b/resources/mybatis1/sunvote/HomeworkReportMapper.xml index 9530779..6c4cf3e 100644 --- a/resources/mybatis1/sunvote/HomeworkReportMapper.xml +++ b/resources/mybatis1/sunvote/HomeworkReportMapper.xml @@ -12,6 +12,7 @@ HOMEWORK_REPORT_ID, RANK, STUDENT_NAME, + STUDENT_ID, STUDNET_NO, KEYBOARD, RIGHT_PERSENT, @@ -26,6 +27,7 @@ #{HOMEWORK_REPORT_ID}, #{RANK}, #{STUDENT_NAME}, + #{STUDENT_ID}, #{STUDNET_NO}, #{KEYBOARD}, #{RIGHT_PERSENT}, @@ -61,6 +63,7 @@ set RANK = #{RANK}, STUDENT_NAME = #{STUDENT_NAME}, + STUDENT_ID = #{STUDENT_ID}, STUDNET_NO = #{STUDNET_NO}, KEYBOARD = #{KEYBOARD}, RIGHT_PERSENT = #{RIGHT_PERSENT}, @@ -78,6 +81,7 @@ set RANK = #{RANK}, STUDENT_NAME = #{STUDENT_NAME}, + STUDENT_ID = #{STUDENT_ID}, STUDNET_NO = #{STUDNET_NO}, KEYBOARD = #{KEYBOARD}, RIGHT_PERSENT = #{RIGHT_PERSENT}, @@ -85,9 +89,9 @@ ANSWER = #{ANSWER}, HOMEWORK_ID = #{HOMEWORK_ID} where + STUDENT_ID = #{STUDENT_ID} + and HOMEWORK_ID = #{HOMEWORK_ID} - and - STUDNET_NO = #{STUDNET_NO} @@ -164,13 +168,14 @@ #{item.HOMEWORK_REPORT_ID}, #{item.RANK}, #{item.STUDENT_NAME}, + #{item.STUDENT_ID}, #{item.STUDNET_NO}, #{item.KEYBOARD}, #{item.RIGHT_PERSENT}, #{item.GET_SCORE}, #{item.ANSWER}, + #{item.COMPLETE_COUNT}, #{item.HOMEWORK_ID} - #{item.COMPLETE_COUNT} ) diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index 008524f..e64d054 100644 --- a/src/com/fh/controller/api/V1.java +++ b/src/com/fh/controller/api/V1.java @@ -2908,9 +2908,10 @@ public class V1 extends BaseController { // 1. 根据班级id 查询班级学生列表 List student = studentService.findByClassId(homePd); for(PageData ptd : student){ + ptd.put("STUDENT_ID", ptd.get("ID")); ptd.put("STUDENT_NAME", ptd.get("NAME")); ptd.put("HOMEWORK_REPORT_ID", this.get32UUID()); - ptd.put("STUDENT_NO", ptd.get("SNO")); + ptd.put("STUDENT_NO", ptd.get("NUMBER")); ptd.put("RANK", student.size() + ""); ptd.put("KEYBOARD", ptd.get("KEYPAD_ID")); ptd.put("RIGHT_PERSENT", "0%"); diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 89d8566..6ff58c7 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -5,6 +5,8 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collections; +import java.util.Comparator; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -369,6 +371,7 @@ public class HomeworkController extends BaseController { stuPd.put("STUDENT_ID", stuPd.get("ID")); stuPd.remove("ID"); } + for (PageData hpd : homeworkList) { hpd.remove("QUESTION_COUNT"); hpd.remove("COMPLETE_COUNT"); @@ -504,6 +507,55 @@ public class HomeworkController extends BaseController { } if(pd.get("HOMEWORK_ID") != null){ List dataList = homeworkService.report(pd); + Collections.sort(dataList,new Comparator(){ + + @Override + public int compare(PageData o1, PageData o2) { + String o1GetScore = o1.getString("STUDENT_SCORE"); + String o2GetScore = o2.getString("STUDENT_SCORE"); + float o1score = 0 ; + float o2score = 0 ; + try{ + o1score = Float.parseFloat(o1GetScore); + }catch(Exception e){ + o1score = -1 ; + } + try{ + o2score = Float.parseFloat(o2GetScore); + }catch(Exception e){ + o2score = -1 ; + } + return o1score - o2score > 0 ? -1 : 1; + } + + }); + for(int i = 0 ; i < dataList.size(); i++){ + PageData tpd1 = dataList.get(i); + if(i == 0){ + tpd1.put("RANK", (i+1)); + }else{ + PageData tpd2 = dataList.get(i-1); + String o1GetScore = tpd1.getString("STUDENT_SCORE"); + String o2GetScore = tpd2.getString("STUDENT_SCORE"); + float o1score = 0 ; + float o2score = 0 ; + try{ + o1score = Float.parseFloat(o1GetScore); + }catch(Exception e){ + o1score = -1 ; + } + try{ + o2score = Float.parseFloat(o2GetScore); + }catch(Exception e){ + o2score = -1 ; + } + if(o2score - o1score == 0){ + tpd1.put("RANK",tpd2.get("RANK")); + }else{ + tpd1.put("RANK", (i+1)); + } + } + } pd.put("DATA", dataList); } if(pd.get("CLASS_ID") != null){