diff --git a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp index 0b4a5d8..d2ae753 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/paper/paper_list2.jsp @@ -53,17 +53,21 @@
- - - - + + + + + + + + @@ -75,11 +79,14 @@
序号 测验标题 创建时间 建议考试时长考试次数 总分 操作
- - - - + + + + + + + @@ -89,9 +96,10 @@ + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp index cd359c6..d877a1d 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -78,7 +78,7 @@ - +
${var.TITLE} ${var.CREATE_DATE} ${var.EXAM_TIME}${var.TEST_NUM} ${var.SCORE} - 查看成绩 + disabled style="pointer-events:none;color:#ccc" href="<%=basePath%>paper/paperRep.do?paper_id=${var.PAPER_ID}">查看成绩
姓名
个人平均正确率
个人平均正确率
得分汇总
 @@ -24,7 +25,8 @@ #{PAPER_ID}, #{SCORE}, #{CLASS_ID}, - #{STUDENTTEST_ID} + #{STUDENTTEST_ID}, + #{LOST_TEST} diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index 25b96f1..4edd16b 100644 --- a/src/com/fh/controller/api/V1.java +++ b/src/com/fh/controller/api/V1.java @@ -1567,6 +1567,7 @@ public class V1 extends BaseController { testPaperInfo.getQuestionId()); testInfoPd.put("ANSWER", testPaperInfo.getAnswer()); + testInfoPd.put("RIGHT", testPaperInfo.getRight()); testInfoPd.put("SCORE", @@ -1591,6 +1592,7 @@ public class V1 extends BaseController { testPaperInfo.getMarkNo()); testInfoPdList.add(testInfoPd); } + } } if(testInfoPdList != null && testInfoPdList.size() > 0){ @@ -1682,8 +1684,8 @@ public class V1 extends BaseController { studentPageData.put("CLASS_ID", testPaper.getClassId()); studentPageData.put("STUDENTTEST_ID", get32UUID()); - studenttestService.save(studentPageData); - + + String flag = ""; for (TestPaperInfo testPaperInfo : studentAnswer .getQuestions()) { testInfoPd = new PageData(); @@ -1698,6 +1700,7 @@ public class V1 extends BaseController { testPaperInfo.getQuestionId()); testInfoPd.put("ANSWER", testPaperInfo.getAnswer()); + flag = testPaperInfo.getAnswer().toString().equals("")?"":testPaperInfo.getAnswer().toString(); testInfoPd.put("RIGHT", testPaperInfo.getRight()); testInfoPd.put("SCORE", @@ -1718,6 +1721,11 @@ public class V1 extends BaseController { testPaperInfo.getMarkNo()); testInfoPdList.add(testInfoPd); } + + if(flag.equals("")){ + studentPageData.put("LOST_TEST","1"); + } + studenttestService.save(studentPageData); } } if(testInfoPdList != null && testInfoPdList.size() > 0){ diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index 55fccb1..7060baa 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -801,6 +801,9 @@ public class PaperController extends BaseController { for(PageData p:varList){ String examTime = p.getString("EXAM_TIME"); + PageData temp = new PageData(); + temp.put("PAPER_ID", p.getString("PAPER_ID")); + List li = testpaperService.listAll(temp); if(examTime != null){ try{ int et = Integer.parseInt(examTime); @@ -825,6 +828,7 @@ public class PaperController extends BaseController { examTime = "00:00"; } p.put("EXAM_TIME", examTime); + p.put("TEST_NUM", li.size()); } mv.addObject("varList", varList); diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java index ab158fb..0137a04 100644 --- a/src/com/fh/controller/sunvote/report/ReportController.java +++ b/src/com/fh/controller/sunvote/report/ReportController.java @@ -99,7 +99,8 @@ public class ReportController extends BaseController { if(studentPd != null && item.get("STUDENT_ID").equals(studentPd.get("STUDENT_ID"))){ // String score = item.getString("SCORE"); - if(!"".equals(score)){ + String lost = item.getString("LOST_TEST"); + if(lost.isEmpty()){ studentPd.put(item.get("TEST_ID"), item.get("SCORE")); }else{ studentPd.put(item.get("TEST_ID"), "--"); @@ -131,7 +132,8 @@ public class ReportController extends BaseController { studentPd.put("STUDENT_ID", item.get("STUDENT_ID")); studentPd.put("NAME", item.get("NAME")); String score = item.getString("SCORE"); - if(!"".equals(score)){ + String lost = item.getString("LOST_TEST"); + if(lost.isEmpty()){ studentPd.put(item.get("TEST_ID"), item.get("SCORE")); }else{ studentPd.put(item.get("TEST_ID"), "--");