update

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/PaperController.java

@@ -31,6 +31,7 @@ import cn.com.qmth.stmms.admin.dto.ObjectiveQuestionDTO;
 import cn.com.qmth.stmms.admin.dto.QuestionDTO;
 import cn.com.qmth.stmms.admin.dto.SubjectQuestionDTO;
 import cn.com.qmth.stmms.admin.dto.SubjectiveQuestionDTO;
+import cn.com.qmth.stmms.biz.exam.model.Exam;
 import cn.com.qmth.stmms.biz.exam.model.ExamQuestion;
 import cn.com.qmth.stmms.biz.exam.model.ExamSubject;
 import cn.com.qmth.stmms.biz.exam.model.MarkGroup;
@@ -92,6 +93,8 @@ public class PaperController extends BaseExamController {
         model.addAttribute("levelList", subjectService.listLevel(examId));
         model.addAttribute("categoryList", subjectService.listCategory(examId));
         model.addAttribute("cardServer", cardServer);
+        Exam exam = examService.findById(examId);
+        model.addAttribute("examType", exam.getType());
         return "modules/exam/paperList";
     }
 
@@ -165,8 +168,8 @@ public class PaperController extends BaseExamController {
         query = questionService.findByQuery(query);
         for (ExamQuestion q : query.getResult()) {
             list.add(objective ? new ObjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode()))
-                    : new SubjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode()),
-                            groupMap.get(q.getSubjectCode() + "_" + q.getGroupNumber())));
+                    : new SubjectiveQuestionDTO(q, subjectMap.get(q.getSubjectCode()), groupMap.get(q.getSubjectCode()
+                            + "_" + q.getGroupNumber())));
         }
         try {
             String fileName = objective ? "客观题数据.xlsx" : "主观题数据.xlsx";
@@ -214,8 +217,9 @@ public class PaperController extends BaseExamController {
                                             questionService.save(entry.getValue());
                                         }
                                     }
-                                    //有题目的分组才保存
-                                    if(questionService.countByExamAndSubjectAndObjectiveAndGroupNumber(examId, group.getSubjectCode(), objective, group.getNumber())!=0){
+                                    // 有题目的分组才保存
+                                    if (questionService.countByExamAndSubjectAndObjectiveAndGroupNumber(examId,
+                                            group.getSubjectCode(), objective, group.getNumber()) != 0) {
                                         groupService.save(group);
                                     }
                                 }
@@ -281,21 +285,21 @@ public class PaperController extends BaseExamController {
         }
         return array;
     }
-    
+
     @RequestMapping(value = "/question-edit/{questionId}", method = RequestMethod.GET)
     @RoleRequire(Role.SCHOOL_ADMIN)
-    public String edit(Model model,@PathVariable Integer questionId) {
+    public String edit(Model model, @PathVariable Integer questionId) {
         ExamQuestion examQuestion = questionService.findById(questionId);
         model.addAttribute("examQuestion", examQuestion);
         model.addAttribute("objectivePolicyList", ObjectivePolicy.values());
         return "modules/exam/questionEdit";
     }
-    
+
     @RequestMapping(value = "/question-edit", method = RequestMethod.POST)
     @RoleRequire(Role.SCHOOL_ADMIN)
     public String update(@RequestParam Integer id, @RequestParam ObjectivePolicy objectivePolicy) {
         ExamQuestion question = questionService.updateObjectivePolicy(id, objectivePolicy);
-        return "redirect:/admin/exam/paper/detail?subjectCode="+question.getSubjectCode();
+        return "redirect:/admin/exam/paper/detail?subjectCode=" + question.getSubjectCode();
     }
-    
+
 }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java

@@ -103,6 +103,8 @@ public class StudentController extends BaseExamController {
         model.addAttribute("categoryList", subjectService.listCategory(examId));
         model.addAttribute("imageServer", imageServer);
         model.addAttribute("packageServer", packageServer);
+        Exam exam = examService.findById(examId);
+        model.addAttribute("examType", exam.getType());
         return "modules/exam/studentList";
     }
 

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/paperList.jsp

@@ -125,7 +125,11 @@
 				<td>${subject.objectiveScore}</td>
 				<td>${subject.subjectiveScore}</td>
 				<td>${subject.totalScore}</td>
-				<td><a href="${ctx}/admin/exam/subject/edit?code=${subject.code}">原图遮盖</a></td>
+				<td>
+				<c:if test="${examType!='MULTI_MEDIA'}">
+				<a href="${ctx}/admin/exam/subject/edit?code=${subject.code}">原图遮盖</a>
+				</c:if>
+				</td>
 			</tr>
 		</c:forEach>
 		</tbody>

stmms-web/src/main/webapp/WEB-INF/views/modules/exam/studentList.jsp

@@ -151,7 +151,12 @@
 				<td>${student.subject.category}</td>
 				<td>
 				<c:if test="${student.upload==true}">
-				已上传
+					<c:if test="${examType!='MULTI_MEDIA'}">
+					<a class="sheet-link" href="##" data-sheet-url="${student.sheetUrlString}" data-answer-url="<c:if test="${student.answerUrl!=null}">${cardServer}${student.answerUrl}</c:if>" data-title="${student.examNumber}&nbsp;&nbsp;${student.name}&nbsp;&nbsp;客观总分${student.objectiveScoreString}&nbsp;&nbsp;主观总分${student.subjectiveScoreString}&nbsp;&nbsp;全卷总分${student.totalScoreString}">已上传</a>
+					</c:if>
+					<c:if test="${examType=='MULTI_MEDIA'}">
+					已上传
+					</c:if>
 				&nbsp;
 				<c:if test="${student.absent==true}">
 				缺考

stmms-web/src/main/webapp/static/mark-json/js/json-loader.js

@@ -14,14 +14,14 @@ JsonLoader.prototype.build = function (task, callback) {
     var self = this;
     if (task != undefined && task.answerUrl != undefined) {
         // TODO-测试代码，读取固定的json文件
-//        var result='[{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"adwe"}]}]},"subNumber":15},{"mainNumber":4,"body":{"sections":[{"blocks":[]}]},"subNumber":16},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfdsf"}]}]},"subNumber":17},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfs##sdf"}]}]},"subNumber":18},{"mainNumber":6,"body":{"sections":[{"blocks":[{"type":"audio","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"subNumber":1},{"mainNumber":6,"body":{"sections":[{"blocks":[{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889895204.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889573137.jpeg"}]}]},"subNumber":20},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":23},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":24}]';
-    	var url = this.answerServer + this.task.answerUrl;
+//        var result='[{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"adwe"}]}]},"subNumber":15},{"mainNumber":4,"body":{"sections":[{"blocks":[]}]},"subNumber":16},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfdsf"}]}]},"subNumber":17},{"mainNumber":4,"body":{"sections":[{"blocks":[{"type":"text","value":"sdfs##sdf"}]}]},"subNumber":18},{"mainNumber":6,"body":{"sections":[{"blocks":[{"type":"audio","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/19/3_8_19_15748452552644264.mp3"}]}]},"subNumber":2},{"mainNumber":6,"body":{"sections":[{"blocks":[{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889591137.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889895204.jpeg"},{"param":{"width":200,"height":200},"type":"image","value":"https://ecs-test-static.qmth.com.cn/oe-answer-file/3/8/20/3_8_20_15748452889573137.jpeg"}]}]},"subNumber":1},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":23},{"mainNumber":6,"body":{"sections":[{"blocks":[]}]},"subNumber":24}]';
+    	var url = this.answerServer + task.answerUrl;
         $.get(url, function (result) {
 //            task.jsonData = JSON.parse(result);
             task.jsonData = result;
             callback();
         }).error(function () {
-        	console.log('json load error');
+        	console.log('json load error:'+url);
             callback('json load error');
         });
     }

stmms-web/src/main/webapp/static/rich-text/js/render.js

@@ -28,7 +28,7 @@ function renderBlock(block, inline) {
         if (inline === true) {
             type += ' inline';
         }
-        inner = '<img src="' + block.value + '"/>';
+        inner = '<img src="' + block.value + '" width="' + block.param.width + '" height="' + block.param.height + '"/>';
     } else if (block.type === 'audio') {
         type = 'audio';
         inner = '<audio controls><source src="' + block.value + '" type="audio/mpeg"></audio>';