update

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

@@ -243,6 +243,12 @@ public class PaperController extends BaseExamController {
                 for (MarkGroup markGroup : groups) {
                     maps.put(markGroup.getNumber(), markGroup);
                 }
+                List<SelectiveGroup> selectiveGroups = selectiveGroupService.findByExamIdAndSubjectCode(examId,
+                        subjectCode);
+                Map<Integer, SelectiveGroup> selectiveMap = new HashMap<Integer, SelectiveGroup>();
+                for (SelectiveGroup selectiveGroup : selectiveGroups) {
+                    selectiveMap.put(selectiveGroup.getMainNumber(), selectiveGroup);
+                }
                 List<ExamQuestion> subjectiveList = mainNumber == null ? questionService
                         .findByExamAndSubjectAndObjective(examId, subjectCode, false) : questionService
                         .findByExamAndSubjectAndObjectiveAndMainNumber(examId, subjectCode, false, mainNumber);
@@ -253,6 +259,18 @@ public class PaperController extends BaseExamController {
                     } else {
                         examQuestion.setEnableUpdate(true);
                     }
+                    // 选做题判分策略
+                    if (selectiveMap.containsKey(examQuestion.getMainNumber())) {
+                        examQuestion.setSelective(true);
+                        examQuestion.setSelectiveIndex(selectiveMap.get(examQuestion.getMainNumber())
+                                .getSelectiveIndex());
+                        examQuestion
+                                .setSelectivePart(selectiveMap.get(examQuestion.getMainNumber()).getSelectivePart());
+                        examQuestion.setScorePolicy(selectiveMap.get(examQuestion.getMainNumber()).getScorePolicy()
+                                .getValue());
+                    } else {
+                        examQuestion.setSelective(false);
+                    }
                 }
                 list.addAll(subjectiveList);
             }

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

@@ -80,6 +80,12 @@
 				<td>
 					<c:if test="${question.objective && question.objectivePolicy==null}">无</c:if>
 					<c:if test="${question.objective && question.objectivePolicy!=null}">${question.objectivePolicy.name}</c:if>
+					<c:if test="${!question.objective && question.selective}">
+						${question.selectiveIndex}-
+						<c:if test="${question.scorePolicy==1}">平均分</c:if>
+						<c:if test="${question.scorePolicy==2}">取高分</c:if>
+						<c:if test="${question.scorePolicy==3}">取低分</c:if>
+					</c:if>
 				</td>
 				<td><c:if test="${!question.objective}">${question.groupNumber}</c:if>
 				</td>