Explorar o código

新增科组长禁止查看成绩查询和任务(试评)查询中查询准考证号

ting.yin %!s(int64=4) %!d(string=hai) anos
pai
achega
6f09070522

+ 14 - 0
stmms-biz/src/main/java/cn/com/qmth/stmms/biz/exam/model/Exam.java

@@ -109,6 +109,12 @@ public class Exam implements Serializable {
     @Column(name = "forbidden_info", nullable = false)
     private boolean forbiddenInfo;
 
+    /**
+     * 禁止查看成绩
+     */
+    @Column(name = "forbidden_score", nullable = false)
+    private boolean forbiddenScore;
+
     /**
      * 客观题统分状态
      */
@@ -280,6 +286,14 @@ public class Exam implements Serializable {
         this.forbiddenInfo = forbiddenInfo;
     }
 
+    public boolean isForbiddenScore() {
+        return forbiddenScore;
+    }
+
+    public void setForbiddenScore(boolean forbiddenScore) {
+        this.forbiddenScore = forbiddenScore;
+    }
+
     public ObjectiveStatus getObjectiveStatus() {
         return objectiveStatus;
     }

+ 5 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/ExamController.java

@@ -142,6 +142,11 @@ public class ExamController extends BaseExamController {
             oldExam.setStatus(exam.getStatus());
             oldExam.setForceSpecialTag(exam.isForceSpecialTag());
             oldExam.setForbiddenInfo(exam.isForbiddenInfo());
+            if (exam.isForbiddenInfo()) {
+                oldExam.setForbiddenScore(exam.isForbiddenScore());
+            } else {
+                oldExam.setForbiddenScore(false);
+            }
             JSONObject sasConfig = new JSONObject();
             sasConfig.accumulate("passScore", passScore);
             sasConfig.accumulate("excellentScore", excellentScore);

+ 5 - 0
stmms-web/src/main/java/cn/com/qmth/stmms/admin/utils/SessionExamUtils.java

@@ -14,6 +14,8 @@ public class SessionExamUtils {
 
     public static final String FORBIDDEN_INFO_KEY = "forbiddenInfo";
 
+    public static final String FORBIDDEN_SCORE_KEY = "forbiddenScore";
+
     public static int getExamId(HttpServletRequest request) {
         int examId = 0;
         try {
@@ -36,14 +38,17 @@ public class SessionExamUtils {
         session.setParameter(EXAM_ID_KEY, null);
         session.setParameter(EXAM_NAME_KEY, null);
         session.setParameter(FORBIDDEN_INFO_KEY, null);
+        session.setParameter(FORBIDDEN_SCORE_KEY, null);
         request.removeAttribute(EXAM_ID_KEY);
         request.removeAttribute(EXAM_NAME_KEY);
         request.removeAttribute(FORBIDDEN_INFO_KEY);
+        request.removeAttribute(FORBIDDEN_SCORE_KEY);
     }
 
     public static void setExamId(HttpServletRequest request, Exam exam) {
         StmmsSession session = RequestUtils.getSession(request);
         session.setParameter(EXAM_ID_KEY, String.valueOf(exam.getId()));
         session.setParameter(FORBIDDEN_INFO_KEY, String.valueOf(exam.isForbiddenInfo()));
+        session.setParameter(FORBIDDEN_SCORE_KEY, String.valueOf(exam.isForbiddenScore()));
     }
 }

+ 26 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examEdit.jsp

@@ -25,6 +25,23 @@
                     }
                 }
             });
+            
+            var forbiddenInfo = ${exam.forbiddenInfo};
+            debugger;
+            if (forbiddenInfo != null && forbiddenInfo ==true) {
+                $("#forbiddenScoreDiv").show();
+            } else {
+            	$("#forbiddenScore").prop("checked", false);
+                $("#forbiddenScoreDiv").hide();
+            }
+            $("#forbiddenInfo").change(function () {
+                if ($("#forbiddenInfo").is(':checked')) {
+                    $("#forbiddenScoreDiv").show();
+                } else {
+                	$("#forbiddenScore").prop("checked", false);
+                    $("#forbiddenScoreDiv").hide();
+                }
+            });
         });
     </script>
 </head>
@@ -70,9 +87,17 @@
 	<div class="control-group">
         <label class="control-label">禁止其他人查看考生信息</label>
         <div class="controls">
-            <input name="forbiddenInfo" type="checkbox" <c:if test="${exam.forbiddenInfo}">checked</c:if>/>
+            <input name="forbiddenInfo" id="forbiddenInfo" type="checkbox" <c:if test="${exam.forbiddenInfo}">checked</c:if>/>
+        </div>
+    </div>
+	<div id="forbiddenScoreDiv">
+	<div class="control-group" >
+        <label class="control-label">禁止科组长成绩查询</label>
+        <div class="controls">
+            <input name="forbiddenScore" id="forbiddenScore" type="checkbox" <c:if test="${exam.forbiddenScore}">checked</c:if>/>
         </div>
     </div>
+    </div>
     <div class="control-group">
         <label class="control-label">及格分</label>
         <div class="controls">

+ 18 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examForm.jsp

@@ -30,6 +30,15 @@
                     $("#forceSpecialTagDiv").show();
                 }
             });
+            $("#forbiddenScoreDiv").hide();
+            $("#forbiddenInfo").change(function () {
+                if ($("#forbiddenInfo").is(':checked')) {
+                    $("#forbiddenScoreDiv").show();
+                } else {
+                	$("#forbiddenScore").prop("checked", false);
+                    $("#forbiddenScoreDiv").hide();
+                }
+            });
         });
     </script>
 </head>
@@ -77,8 +86,16 @@
 	<div class="control-group">
         <label class="control-label">禁止其他人查看考生信息</label>
         <div class="controls">
-            <input name="forbiddenInfo" type="checkbox" <c:if test="${exam.forbiddenInfo}">checked</c:if>/>
+            <input name="forbiddenInfo" id="forbiddenInfo" type="checkbox" <c:if test="${exam.forbiddenInfo}">checked</c:if>/>
         </div>
+    </div>
+	<div id="forbiddenScoreDiv">
+	<div class="control-group" >
+        <label class="control-label">禁止科组长成绩查询</label>
+        <div class="controls">
+            <input name="forbiddenScore" id="forbiddenScore" type="checkbox" <c:if test="${exam.forbiddenScore}">checked</c:if>/>
+        </div>
+    </div>
     </div>
     <div class="control-group">
         <label class="control-label">及格分</label>

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

@@ -144,7 +144,9 @@
                                     
                                     <c:if test="${web_user.subjectHeader==true}">
                                         <li><a href="${ctx}/admin/exam/mark" target="mainFrame"><i class="icon-pencil"></i><span data-i18n-text="index.mark">评卷管理</span></a></li>
+                                        <c:if test="${forbiddenScore!=true}">
                                         <li><a href="${ctx}/admin/exam/score" target="mainFrame"><i class="icon-search"></i><span data-i18n-text="index.score">成绩查询</span></a></li>
+                                        </c:if>
                                         <li><a href="${ctx}/admin/exam/inspected" target="mainFrame"><i class="icon-flag"></i><span data-i18n-text="index.inspected">成绩复核</span></a></li>
                                         <li><a href="${ctx}/admin/exam/problem/history" target="mainFrame"><i class="icon-tag"></i><span data-i18n-text="index.problem">问题试卷</span></a></li>
                                         <li><a href="${ctx}/admin/exam/reportSubject" target="mainFrame"><i class="icon-signal"></i><span data-i18n-text="index.report.total">总量分析</span></a></li>

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

@@ -51,9 +51,11 @@
             </c:forEach>
         </select>
         <br/><br/>
+        <c:if test="${forbiddenScore!=true}">
         <label>准考证号</label>
         <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"/>
         &nbsp;
+        </c:if>
         <label>考生编号</label>
         <input type="text" name="secretNumber" id="secretNumber" value="${query.secretNumber}" class="input-medium"/>
         &nbsp;

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

@@ -36,8 +36,10 @@
                 <option value="${item.number}" <c:if test="${item.number==query.groupNumber}">selected</c:if>>${item.number}-${item.title}</option>
             </c:forEach>
         </select>
+        <c:if test="${forbiddenScore!=true}">
         <label>准考证号</label>
         <input type="text" name="examNumber" value="${query.examNumber}" maxlength="20" class="input-medium"/>
+       	</c:if>
         <label>考生编号</label>
         <input type="text" name="secretNumber" id="secretNumber" value="${query.secretNumber}" maxlength="10" class="input-medium"/>
         &nbsp;