Home Explore Help
Sign In
luoshi
/
stmms-ft
1
0
Fork 0
Files
Browse Source

fix bugs

ting.yin 4 years ago
parent
a1344d0fce
commit
318ef90180
4 changed files with 31 additions and 26 deletions
Unified View Show Diff Stats
  1. 26 20
      stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java
  2. 0 1
      stmms-web/src/main/webapp/WEB-INF/views/modules/exam/examIndex.jsp
  3. 1 1
      stmms-web/src/main/webapp/WEB-INF/views/modules/exam/problemList.jsp
  4. 4 4
      stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp

+ 26 - 20
stmms-web/src/main/java/cn/com/qmth/stmms/admin/exam/StudentController.java
View File 

@@ -1,5 +1,29 @@
 
 package cn.com.qmth.stmms.admin.exam;
 
 package cn.com.qmth.stmms.admin.exam;
 
 
 
+import java.util.Date;
 
+import java.util.HashMap;
 
+import java.util.LinkedList;
 
+import java.util.List;
 
+import java.util.Map;
 
+
 
+import javax.servlet.http.HttpServletRequest;
 
+import javax.servlet.http.HttpServletResponse;
 
+
 
+import net.sf.json.JSONObject;
 
+
 
+import org.apache.commons.lang.StringUtils;
 
+import org.slf4j.Logger;
 
+import org.slf4j.LoggerFactory;
 
+import org.springframework.beans.factory.annotation.Autowired;
 
+import org.springframework.stereotype.Controller;
 
+import org.springframework.ui.Model;
 
+import org.springframework.web.bind.annotation.RequestMapping;
 
+import org.springframework.web.bind.annotation.RequestMethod;
 
+import org.springframework.web.bind.annotation.RequestParam;
 
+import org.springframework.web.bind.annotation.ResponseBody;
 
+import org.springframework.web.multipart.MultipartFile;
 
+import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+
 
 import cn.com.qmth.stmms.admin.vo.ExamStudentVO;
 
 import cn.com.qmth.stmms.admin.vo.ExamStudentVO;
 
 import cn.com.qmth.stmms.admin.vo.UploadStudentVO;
 
 import cn.com.qmth.stmms.admin.vo.UploadStudentVO;
 
 import cn.com.qmth.stmms.biz.exam.model.Exam;
 
 import cn.com.qmth.stmms.biz.exam.model.Exam;
 
@@ -22,27 +46,8 @@ import cn.com.qmth.stmms.common.enums.SubjectiveStatus;
 
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 
 import cn.com.qmth.stmms.common.utils.ExportExcel;
 
 import cn.com.qmth.stmms.common.utils.ImportExcel;
 
 import cn.com.qmth.stmms.common.utils.ImportExcel;
 
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
 import cn.com.qmth.stmms.common.utils.RequestUtils;
 
-import com.google.common.collect.Lists;
 
-import net.sf.json.JSONObject;
 
-import org.apache.commons.lang.StringUtils;
 
-import org.slf4j.Logger;
 
-import org.slf4j.LoggerFactory;
 
-import org.springframework.beans.factory.annotation.Autowired;
 
-import org.springframework.stereotype.Controller;
 
-import org.springframework.ui.Model;
 
-import org.springframework.web.bind.annotation.RequestMapping;
 
-import org.springframework.web.bind.annotation.RequestMethod;
 
-import org.springframework.web.bind.annotation.RequestParam;
 
-import org.springframework.web.bind.annotation.ResponseBody;
 
-import org.springframework.web.multipart.MultipartFile;
 
-import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
 
 
-import javax.servlet.http.HttpServletRequest;
 
-import javax.servlet.http.HttpServletResponse;
 
-import java.util.HashMap;
 
-import java.util.LinkedList;
 
-import java.util.List;
 
-import java.util.Map;
 
+import com.google.common.collect.Lists;
 
 
 
 @Controller("examStudentController")
 
 @Controller("examStudentController")
 
 @RequestMapping("/admin/exam/student")
 
 @RequestMapping("/admin/exam/student")
 
@@ -454,6 +459,7 @@ public class StudentController extends BaseExamController {
 
         JSONObject result = new JSONObject();
 
         JSONObject result = new JSONObject();
 
         ExamStudent student = studentService.findById(id);
 
         ExamStudent student = studentService.findById(id);
 
         student.setBreach(false);
 
         student.setBreach(false);
 
+        student.setUploadTime(new Date());
 
         student = studentService.save(student);
 
         student = studentService.save(student);
 
         if (student != null) {
 
         if (student != null) {
 
             result.accumulate("message", "重置成功！");
 
             result.accumulate("message", "重置成功！");

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

@@ -152,7 +152,6 @@
 
                                     </c:if>
 
                                     </c:if>
 
                                     
                                     
                                     <c:if test="${web_user.schoolViewer==true}">
 
                                     <c:if test="${web_user.schoolViewer==true}">
 
-                                        <li><a href="${ctx}/admin/exam/list" target="mainFrame"><i class="icon-th-list"></i><span data-i18n-text="index.exam">考试管理</span></a></li>
 
                                         <li><a href="${ctx}/admin/exam/score" target="mainFrame"><i class="icon-search"></i><span data-i18n-text="index.score">成绩查询</span></a></li>
 
                                         <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>
 
                                     </c:if>

+ 1 - 1
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/problemList.jsp
View File 

@@ -10,7 +10,7 @@
 
 </head>

 </head>

 <body>

 <body>

 	<ul class="nav nav-tabs">

 	<ul class="nav nav-tabs">

-		<li class="active"><a href="${ctx}/admin/exam/problem/type">分类列表</a></li>

+		<li class="active"><a href="#">分类列表</a></li>

 		<c:if test="${web_user.schoolAdmin==true}">

 		<c:if test="${web_user.schoolAdmin==true}">

 		<li><a href="${ctx}/admin/exam/problem/type/add?examId=${examId}">添加分类</a></li>

 		<li><a href="${ctx}/admin/exam/problem/type/add?examId=${examId}">添加分类</a></li>

 		</c:if>

 		</c:if>

+ 4 - 4
stmms-web/src/main/webapp/WEB-INF/views/modules/exam/scoreList.jsp
View File 

@@ -98,7 +98,7 @@
 
         <tr>
 
         <tr>
 
             <td>
 
             <td>
 
                    <%--  <a href="##" class="detail-link" data-exam-number="${student.examNumber}">${student.examNumber}</a> --%>
 
                    <%--  <a href="##" class="detail-link" data-exam-number="${student.examNumber}">${student.examNumber}</a> --%>
 
-	            <c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
 
+	            <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
 
 	            ${fn:substring(student.examNumber,0,1)}***
 
 	            ${fn:substring(student.examNumber,0,1)}***
 
 	            </c:if>
 
 	            </c:if>
 
 	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
 
 	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
 
@@ -106,7 +106,7 @@
 
 	            </c:if>
 
 	            </c:if>
 
             </td>
 
             </td>
 
             <td>
 
             <td>
 
-	            <c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
 
+	            <c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
 
 	            ${fn:substring(student.name,0,1)}**
 
 	            ${fn:substring(student.name,0,1)}**
 
 	            </c:if>
 
 	            </c:if>
 
 	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
 
 	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
 
@@ -114,7 +114,7 @@
 
 	            </c:if>
 
 	            </c:if>
 
             </td>
 
             </td>
 
             <td>
 
             <td>
 
-            	<c:if test="${web_user.subjectHeader==true && forbiddenInfo==true}">
 
+            	<c:if test="${(web_user.subjectHeader==true||web_user.schoolViewer==true) && forbiddenInfo==true}">
 
 	            ${fn:substring(student.studentCode,0,1)}***
 
 	            ${fn:substring(student.studentCode,0,1)}***
 
 	            </c:if>
 
 	            </c:if>
 
 	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
 
 	            <c:if test="${web_user.schoolAdmin==true || forbiddenInfo==false}">
 
@@ -216,7 +216,7 @@
 
             window.location.href = url;
 
             window.location.href = url;
 
         });
 
         });
 
         $('.sheet-link').click(function () {
 
         $('.sheet-link').click(function () {
 
-            initSheetTagPopover($(this).attr('data-id'), $(this).attr('data-title'), '', $(this).attr('data-sheet-url'), $(this).attr('data-answer-url'));
 
+            initSheetTagPopover($(this).attr('data-id'), $(this).attr('data-title'), '${fileServer}', $(this).attr('data-sheet-url'), $(this).attr('data-answer-url'));
 
             //initSheetPopover($(this).attr('data-title'), '', $(this).attr('data-sheet-url'));
 
             //initSheetPopover($(this).attr('data-title'), '', $(this).attr('data-sheet-url'));
 
             return false;
 
             return false;
 
         });
 
         });