修复评卷员查询；任务查询；大题修改；主观题导入

stmms-biz/src/main/java/cn/com/qmth/stmms/biz/mark/query/MarkLibrarySearchQuery.java

@@ -18,7 +18,7 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
 
     private int campusId;
 
-    private int studentId;
+    private Integer studentId;
 
     private String examNumber;
 
@@ -65,11 +65,11 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         this.subjectCode = subjectCode;
     }
 
-    public int getStudentId() {
+    public Integer getStudentId() {
         return studentId;
     }
 
-    public void setStudentId(int studentId) {
+    public void setStudentId(Integer studentId) {
         this.studentId = studentId;
     }
 

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

@@ -120,7 +120,7 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                 if (StringUtils.isNotBlank(query.getExamNumber())) {
                     predicates.add(cb.equal(root.get("examNumber"), query.getExamNumber()));
                 }
-                if (query.getStudentId() > 0) {
+                if (query.getStudentId()!=null ) {
                     predicates.add(cb.equal(root.get("studentId"), query.getStudentId()));
                 }
                 if (query.getMarkerId() > 0) {

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

@@ -287,7 +287,7 @@ public class MarkGroupController extends BaseExamController {
             @RequestParam(required = false) Double doubleRate,
             @RequestParam(required = false) Double arbitrateThreshold,
             @RequestParam(required = false) Integer scorePolicy, @RequestParam(required = false) MarkMode markMode,
-            @RequestParam(required = false) Integer trialCount, @RequestParam(required = false) Boolean sheetView) {
+            @RequestParam(required = false) Integer trialCount, @RequestParam(required = false) boolean sheetView) {
         int examId = getSessionExamId(request);
         MarkGroup group = groupService.findOne(examId, subjectCode, number);
         List<ExamQuestion> questionList = questionService.findByExamAndSubjectAndObjectiveAndMainNumber(examId,
@@ -323,9 +323,7 @@ public class MarkGroupController extends BaseExamController {
             if (trialCount != null && trialCount > 0 && group.getStatus() == MarkStatus.TRIAL) {
                 groupService.updateTrialCount(examId, subjectCode, number, trialCount);
             }
-            if (sheetView != null) {
-                groupService.updateSheetView(examId, subjectCode, number, sheetView);
-            }
+            groupService.updateSheetView(examId, subjectCode, number, sheetView);
             // advance update
             ScorePolicy policy = scorePolicy != null ? ScorePolicy.findByValue(scorePolicy) : null;
             List<Double> scores = buildDoubleList(scoreList);

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

@@ -185,9 +185,8 @@ public class PaperController extends BaseExamController {
                                 questionService.save(question);
                             }
                         } else {
+                        	questionService.deleteByExamAndSubjectAndObjective(examId,dto.getSubjectCode(), false);
                             for (MarkGroup group : dto.getGroups().values()) {
-                            	questionService.deleteByExamAndSubjectAndObjectiveAndMainNumber(group.getExamId(),
-                            			group.getSubjectCode(), false, group.getNumber());
                             	for (ExamQuestion question : group.getQuestionList()) {
                             		questionService.save(question);
                             	}

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

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

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="text" name="studentId" value="${query.studentId}" maxlength="20" class="input-medium"/>
+            <input type="text" name="studentId" value="${query.studentId}" maxlength="10" class="input-medium"/>
             &nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 		</div>

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

@@ -117,7 +117,7 @@
             <select class="input-medium" id="group-select" name="groupNumber">
             </select>
 			<label>登录名</label>
-			<input type="text" name="loginName" value="${query.loginName}"  maxlength="10" class="input-small"/>
+			<input type="text" name="loginName" value="${query.loginName}"  maxlength="30" class="input-small"/>
 			&nbsp;
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 			<c:if test="${web_user.schoolAdmin==true}">
@@ -219,6 +219,7 @@ $("#btnExport").click(function(){
 		if(v=="ok"){
 			$("#searchForm").attr("action","/admin/exam/marker/export");
 			$("#searchForm").submit();
+			$("#searchForm").attr("action","${ctx}/admin/exam/marker");
 		}
 	},{buttonsFocus:1});
 	top.$('.jbox-body .jbox-icon').css('top','55px');