增加添加考生时属性；修复任务生成bug；主观题导入问题；评卷员查询问题

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/service/Impl/MarkCronService.java

@@ -163,6 +163,9 @@ public class MarkCronService {
             while (groupService.needTrialLibrary(examId, subjectCode, group.getNumber())) {
                 // 随机取一个未生成试评任务的考生
                 ExamStudent student = studentService.randomUnTrialStudent(examId, subjectCode, group.getNumber());
+                if(student==null){
+                	break;
+                }
                 // 补充学习中心集合
                 Campus campus = getCampus(student, campusMap);
                 if (campus == null) {

stmms-web/src/main/java/cn/com/qmth/stmms/admin/dto/SubjectiveQuestionDTO.java

@@ -68,7 +68,7 @@ public class SubjectiveQuestionDTO implements QuestionDTO {
         setScorePolicy(group != null && group.getScorePolicy() != null ? group.getScorePolicy().getValue()
                 : ScorePolicy.AVG.getValue());
         setMarkMode(group != null && group.getMarkMode() != null ? group.getMarkMode().getName() : "");
-        setTrialCount(question.getTrialCount());
+        setTrialCount(group.getTrialCount());
     }
 
     public ExamQuestion transform() {

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

@@ -186,13 +186,21 @@ public class PaperController extends BaseExamController {
                             }
                         } else {
                             for (MarkGroup group : dto.getGroups().values()) {
-                                if (groupService.findOne(examId, group.getSubjectCode(), group.getNumber()) == null) {
-                                    questionService.deleteByExamAndSubjectAndObjectiveAndMainNumber(group.getExamId(),
-                                            group.getSubjectCode(), false, group.getNumber());
-                                    for (ExamQuestion question : group.getQuestionList()) {
-                                        questionService.save(question);
-                                    }
+                            	questionService.deleteByExamAndSubjectAndObjectiveAndMainNumber(group.getExamId(),
+                            			group.getSubjectCode(), false, group.getNumber());
+                            	for (ExamQuestion question : group.getQuestionList()) {
+                            		questionService.save(question);
+                            	}
+                            	MarkGroup old = groupService.findOne(examId, group.getSubjectCode(), group.getNumber()) ;
+                                if (old==null) {
                                     groupService.save(group);
+                                }else{
+                                	old.setScorePolicy(group.getScorePolicy());
+                                	old.setArbitrateThreshold(group.getArbitrateThreshold());
+                                	old.setDoubleRate(group.getDoubleRate());
+                                	old.setMarkMode(group.getMarkMode());
+                                	old.setTrialCount(group.getTrialCount());
+                                	groupService.save(old);
                                 }
                             }
                         }

stmms-web/src/main/webapp/WEB-INF/views/include/head.jsp

@@ -35,4 +35,4 @@
 <script src="${ctxStatic}/jquery-jbox/2.3/i18n/jquery.jBox-zh-CN.min.js" type="text/javascript"></script>
 <script src="${ctxStatic}/utils/image-utils.js" type="text/javascript"></script>
 
-<link rel="shortcut icon" href="${ctxStatic}/favicon.ico">
+<link rel="shortcut icon" href="${ctxStatic}/favicon.png">

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

@@ -263,7 +263,7 @@ $('.release-button').click(function(){
 $('#subject-select').change(function(){
     var code = $(this).val();
     $('#group-select').empty();
-    $('#group-select').append('<option value="0">请选择</option>');
+    $('#group-select').append('<option value="">请选择</option>');
     if(code==''){
         $('#group-select').val('0').trigger('change');
         return;

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

@@ -46,6 +46,24 @@
 				<form:input path="examNumber" htmlEscape="false" maxlength="200" class="required"/>
 			</div>
 		</div>
+		<div class="control-group">
+			<label class="control-label">学院</label>
+			<div class="controls">
+				<form:input path="college" htmlEscape="false" maxlength="200" class="required"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">班级</label>
+			<div class="controls">
+				<form:input path="className" htmlEscape="false" maxlength="200" class="required"/>
+			</div>
+		</div>
+		<div class="control-group">
+			<label class="control-label">任课老师</label>
+			<div class="controls">
+				<form:input path="teacher" htmlEscape="false" maxlength="200" class="required"/>
+			</div>
+		</div>
 		<div class="control-group">
 			<label class="control-label">签到表编号</label>
 			<div class="controls">

stmms-web/src/main/webapp/WEB-INF/views/modules/sys/login.jsp

@@ -6,7 +6,6 @@
 	<meta name="decorator" content="default"/>
 	<%@include file="/WEB-INF/views/include/head.jsp" %>
     <link rel="stylesheet" href="${ctxStatic}/common/login.css">
-    <link rel="icon" href="${ctxStatic}/favicon.png" type="image/x-icon">
 	<script type="text/javascript">
 		$(document).ready(function() {
 			$("#showType").hide();