修复考生导入；主观题更新分数；考生编号输入验证

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/service/impl/ExamStudentServiceImpl.java

@@ -153,12 +153,12 @@ public class ExamStudentServiceImpl extends BaseQueryService<ExamStudent> implem
                 subject.setHasAnswer(false);
                 subject.setHasPaper(false);
                 subject.setRemark(es.getRemark());
-                subjectService.save(subject);
             } else {
                 es.setName(subject.getName());
                 es.setLevel(subject.getLevel());
                 es.setCategory(subject.getCategory());
             }
+            subjectService.save(subject);
         }
 
         for (String name : campusSet) {

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

@@ -184,6 +184,7 @@ public class PaperController extends BaseExamController {
                             for (ExamQuestion question : dto.getQuestionList()) {
                                 questionService.save(question);
                             }
+                            subjectService.updateScore(examId, subject.getCode(), objective,dto.getTotalScore());
                         } else {
                             for (MarkGroup group : dto.getGroups().values()) {
                             	MarkGroup old = groupService.findOne(examId, group.getSubjectCode(), group.getNumber()) ;
@@ -194,8 +195,8 @@ public class PaperController extends BaseExamController {
                                     groupService.save(group);
                                 }
                             }
+                            subjectService.updateScore(examId, subject.getCode(), objective, groupService.sumTotalScore(examId, dto.getSubjectCode()));
                         }
-                        subjectService.updateScore(examId, subject.getCode(), objective, dto.getTotalScore());
                         success++;
                     }
                 } else {

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

@@ -323,7 +323,7 @@ public class StudentController extends BaseExamController {
         if (previous != null) {
         	return updatePrevious(student, previous);
         }
-        if (current != null) {
+        if (current != null && !current.isEmpty()) {
             previous = current.get(student.getExamNumber());
         } else {
             previous = studentService.findByExamIdAndExamNumber(student.getExamId(), student.getExamNumber());
@@ -331,11 +331,9 @@ public class StudentController extends BaseExamController {
 
         if (previous == null) {
             return student;
-        }
-        if (student.getId() != null && student.getId().intValue() == previous.getId().intValue()) {
+        }else{
             return updatePrevious(student, previous);
         }
-        return null;
     }
 
 	private ExamStudent updatePrevious(ExamStudent student, ExamStudent previous) {

stmms-web/src/main/webapp/WEB-INF/application.properties

@@ -1,7 +1,7 @@
 #jdbc config
 driverClassName=com.mysql.jdbc.Driver
 #jdbc config
-url=jdbc:mysql://localhost:3306/stmms_ft?useUnicode=true&characterEncoding=UTF-8
+url=jdbc:mysql://192.168.10.141:3306/stmms_ft_online?useUnicode=true&characterEncoding=UTF-8
 username=root
 password=123456
 

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

@@ -51,7 +51,7 @@
             <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"/>
 			&nbsp;
 			<label>考生编号</label>
-            <input type="number" name="studentId" value="${query.studentId}" maxlength="10" class="input-medium"/>
+            <input type="text" name="studentId" value="${query.studentId}" maxlength="10" class="input-medium"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
             &nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 		</div>

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

@@ -35,7 +35,7 @@
             <label>准考证号</label>
             <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-small"/>
 			<label>考生编号</label>
-            <input type="number" name="studentId" value="${query.studentId}" maxlength="10" class="input-small"/>
+            <input type="text" name="studentId" value="${query.studentId}" maxlength="10" class="input-small" onkeyup="this.value=this.value.replace(/\D/g,'')"/>
             &nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 		</div>