增加科组长查看成绩分析的权限；任务管理增加总分查询

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

@@ -34,6 +34,10 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
 
     private Double markerScore;
 
+    private Double startScroe;
+
+    private Double endScroe;
+
     public MarkLibrarySearchQuery() {
         super();
         this.statusSet = new HashSet<>();
@@ -143,4 +147,20 @@ public class MarkLibrarySearchQuery extends BaseQuery<MarkLibrary> {
         this.markerScore = markerScore;
     }
 
+    public Double getStartScroe() {
+        return startScroe;
+    }
+
+    public void setStartScroe(Double startScroe) {
+        this.startScroe = startScroe;
+    }
+
+    public Double getEndScroe() {
+        return endScroe;
+    }
+
+    public void setEndScroe(Double endScroe) {
+        this.endScroe = endScroe;
+    }
+
 }

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

@@ -144,6 +144,11 @@ public class MarkLibraryServiceImpl extends BaseQueryService<MarkLibrary> implem
                 if (query.getMarkerScore() != null) {
                     predicates.add(cb.equal(root.get("markerScore"), query.getMarkerScore()));
                 }
+                if (query.getStartScroe() != null) {
+                    Predicate predicate1 = cb.ge(root.get("markerScore"), query.getStartScroe());
+                    Predicate predicate2 = cb.le(root.get("markerScore"), query.getEndScroe());
+                    predicates.add(cb.and(predicate1, predicate2));
+                }
                 return predicates.isEmpty() ? cb.conjunction()
                         : cb.and(predicates.toArray(new Predicate[predicates.size()]));
             }

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectClassController.java

@@ -44,6 +44,10 @@ public class ReportSubjectClassController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectCollegeController.java

@@ -43,6 +43,10 @@ public class ReportSubjectCollegeController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectController.java

@@ -43,6 +43,10 @@ public class ReportSubjectController extends BaseExamController {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
         query.setExamId(examId);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query = reportSubjectService.findByQuery(query);
         if (query.getCurrentCount() > 0) {
             model.addAttribute("list", query.getResult());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectGroupController.java

@@ -48,6 +48,10 @@ public class ReportSubjectGroupController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectQuestionController.java

@@ -47,6 +47,10 @@ public class ReportSubjectQuestionController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectRangeController.java

@@ -44,6 +44,10 @@ public class ReportSubjectRangeController extends BaseExamController {
         int examId = getSessionExamId(request);
         // reportSubjectRangeService.saveReportRangeSubjectData(1);
         query.setExamId(examId);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query = reportSubjectRangeService.findByQuery(query);
         if (query.getCurrentCount() > 0) {
             model.addAttribute("list", query.getResult());

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherClassController.java

@@ -49,6 +49,10 @@ public class ReportSubjectTeacherClassController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/admin/report/ReportSubjectTeacherController.java

@@ -43,6 +43,10 @@ public class ReportSubjectTeacherController extends BaseExamController {
     public String list(Model model, HttpServletRequest request, ReportSubjectQuery query) {
         WebUser webuser = RequestUtils.getWebUser(request);
         int examId = getSessionExamId(request);
+        String subjectCode = RequestUtils.getSession(request).getParameter("subjectCode");
+        if (subjectCode != null) {
+            query.setSubjectCode(subjectCode);
+        }
         query.setExamId(examId);
         query.setPageNumber(1);
         query.setPageSize(Integer.MAX_VALUE);

stmms-web/src/main/java/cn/com/qmth/stmms/api/controller/ScanController.java

@@ -83,10 +83,10 @@ public class ScanController extends BaseApiController {
                         obj.accumulate("examNumber", student.getExamNumber());
                         obj.accumulate("uploadTime", DateUtils.formatDateTime(student.getUploadTime()));
                         array.add(obj);
-                    }
-                    // 增加人工审核数据
-                    if (sc.isManual()) {
-                        checkStudentService.save(new CheckStudent(student.getId(), examId, student.getSubjectCode(), CheckType.MANUAL));
+                        // 增加人工审核数据
+                        if (sc.isManual()) {
+                            checkStudentService.save(new CheckStudent(student.getId(), examId, student.getSubjectCode(), CheckType.MANUAL));
+                        }
                     }
                 }
             }

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

@@ -104,7 +104,8 @@
                                             <li><a href="${ctx}/admin/exam-list" target="mainFrame" ><i class="icon-th-list"></i>考试管理</a></li>
                                             <li><a href="${ctx}/admin/exam/student" target="mainFrame" ><i class="icon-user"></i>考生管理</a></li>
                                             <li><a href="${ctx}/admin/exam/mark" target="mainFrame" ><i class="icon-pencil"></i>评卷管理</a></li>
-                                            <li><a href="${ctx}/admin/exam/score" target="mainFrame" ><i class="icon-search"></i>成绩查询</a></li>      
+                                            <li><a href="${ctx}/admin/exam/score" target="mainFrame" ><i class="icon-search"></i>成绩查询</a></li> 
+                                            <li><a href="${ctx}/admin/exam/reportSubjectRange" target="mainFrame" ><i class="icon-search"></i>成绩分析</a></li>     
                                             <li><a href="${ctx}/admin/exam/tag" target="mainFrame" ><i class="icon-tag"></i>标记试卷</a></li>         
                                             </c:if>
                                             

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

@@ -53,6 +53,11 @@
 			<label>考生编号</label>
             <input type="text" name="studentId" id="studentId" value="${query.studentId}" maxlength="10" class="input-medium"onkeyup="this.value=this.value.replace(/\D/g,'')"/>
             &nbsp;
+            <label>总分：从</label>
+			<input  type="text" number="true" id="startScroe"  name="startScroe"value="${query.startScroe}" class="input-medium"/>
+			<label> 到&nbsp;&nbsp;&nbsp;</label>
+			<input type="text"  number="true" id="endScroe" name="endScroe"  value="${query.endScroe}"  class="input-medium"/>
+			
 			<input id="btnSubmit" class="btn btn-primary" type="button" value="查询" onclick="goSearch()"/>
 		</div>
 	</form>
@@ -194,6 +199,20 @@ function page(n,s){
     return false;
 }
 function goSearch(){
+	var startScroe = $("#startScroe").val();var endScore = $("#endScroe").val();
+    if(startScroe.length>0){
+        if(endScore.length == 0){
+            alert("请输入结束分数值！");return false;
+        }
+    }if(endScore.length>0){
+        if(startScroe.length == 0){
+            alert("请输入开始分数值！");return false;
+        }
+    }if(endScore.length>0 && startScroe.length > 0){
+        if(parseInt(startScroe) > parseInt(endScore)){
+            alert("开始分值必须小于结束分值");return false;
+        }
+    }
     $("#pageNumber").val(1);
     var studentId = parseInt($("#studentId").val());
     if( $("#studentId").val()!="" && studentId>2147483647 ){

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

@@ -100,8 +100,15 @@
 			<c:if test="${query.totalCount>0 && query.totalCount<=10000}">
 			&nbsp;<input id="export-button" class="btn" type="button" value="导出"/>
 			</c:if>
-			&nbsp;<input id="breachBtnImport" class="btn" type="button" value="违纪名单导入"/>
-            &nbsp;<input id="absentBtnImport" class="btn" type="button" value="缺考名单导入"/>
+			<div class="btn-group">
+                        <a class="btn dropdown-toggle" data-toggle="dropdown" href="#">
+                            导入名单<span class="caret"></span>
+                        </a>
+                        <ul class="dropdown-menu">
+                            <li><a href="##" id="breachBtnImport">违纪名单</a></li>
+                            <li><a href="##" id="absentBtnImport">缺考名单</a></li>
+                        </ul>
+            </div>
 		</div>
 	</form>
 	<tags:message content="${message}"/>