管理员过滤条件

孙向锦
1 parent eef2f078
Showing 7 changed files with 38 additions and 11 deletions
WebRoot/WEB-INF/jsp/sunvote/paper/paper_list4.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp
resources/mybatis1/sunvote/StudentTestMapper.xml
src/com/fh/controller/base/BaseController.java
src/com/fh/controller/sunvote/report/ReportController.java
src/com/fh/controller/system/login/LoginController.java
src/com/fh/util/Const.java
@@ -72,8 +72,7 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
+				<col style="width: 20%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<thead>
@@ -86,7 +85,6 @@
 						<th>创建时间</th>
 						<th>建议考试时长</th>
 						<th>总分</th>
-						<th>操作</th>
 					</tr>
 				</thead>
 			</table>
@@ -99,8 +97,7 @@
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
-				<col style="width: 10%" />
-				<col style="width: 10%" />
+				<col style="width: 20%" />
 				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<tbody>
@@ -116,9 +113,6 @@
 								<td >${var.CREATE_DATE}</td>
 								<td >${var.EXAM_TIME}</td>
 								<td >${var.SCORE}</td>
-								<td>
-								<a href="#" onclick="del('${var.PAPER_ID}');"><img src="../static/images/remove.png" /></a>
-								</td>
 							</tr>
 						</c:forEach>
@@ -246,10 +246,15 @@
 		}
 		function student(classid,studentid){
+		
 			var url = "<%=basePath%>report/student_report?studentid=" + studentid + "&class_id=" + classid ;
 			var startDate = $("#lastStart").val();
 			var endDate =  $("#lastEnd").val();
 			url = url + "&start_date=" + startDate + "&end_date=" + endDate ;
+			var SUBJECT_ID = $("#SUBJECT_ID").val();
+			if(SUBJECT_ID != null && SUBJECT_ID != ''){
+				url = url + "&SUBJECT_ID="+ SUBJECT_ID ;
+			}
 			window.self.location.href = url;
 			window.top.loading.show();
 		}
@@ -155,6 +155,9 @@
 		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
 			and (CREATE_DATE &lt; #{END_DATE})
 		</if>
+		<if test="SUBJECT_ID != null and SUBJECT_ID != ''"><!-- 关键词检索 -->
+			and (sv_testpaper.SUBJECT_ID = #{SUBJECT_ID})
+		</if>
 		order by CREATE_DATE
@@ -91,6 +91,12 @@ public class BaseController {
 		return "ERROR";
 	}
+	public String getRole(){
+		Session session = Jurisdiction.getSession();
+		String role = (String)session.getAttribute(getUsername() + Const.ROLE_ID);
+		return role;
+	}
+	
 	public String geTeacherID(){
 		Session session = Jurisdiction.getSession();
 		User user = (User)session.getAttribute(Const.SESSION_USER);
@@ -161,7 +161,11 @@ public class ReportController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = getPageData();
-		mv.addObject("URL", "report/student_report_data?class_id=" +pd.getString("CLASS_ID"));
+		String url = "report/student_report_data?class_id=" +pd.getString("CLASS_ID");
+		if(pd.getString("SUBJECT_ID") != null){
+			url += "&SUBJECT_ID=" + pd.getString("SUBJECT_ID");
+		}
+		mv.addObject("URL",url);
 		mv.setViewName("sunvote/teacher/stduent_report");
 		mv.addObject("start_date", pd.get("START_DATE"));
 		mv.addObject("end_date", pd.get("END_DATE"));
@@ -176,7 +180,9 @@ public class ReportController extends BaseController {
 		ResponseGson<PageData> ret = new ResponseGson();
 //		pd.put("CLASS_ID", pd.get("CLASSID"));
 		List<PageData> studentList = studentService.listAllClass(pd);
-		pd.put("TEACHER_ID", getUserID());
+		if ("teacher".equals(getRole())) {
+			pd.put("TEACHER_ID", getUserID());
+		}
 		List<PageData> testpaperList = testpaperService.listAll(pd);
 		pd.put("ID", pd.get("CLASS_ID"));
 		PageData classPageData = sclassService.findById(pd);
@@ -214,7 +220,12 @@ public class ReportController extends BaseController {
 				if(pd.containsKey("END_DATE")){
 					search.put("END_DATE", pd.getString("END_DATE"));
 				}
-				search.put("TEACHER_ID", getUserID());
+				if("teacher".equals(getRole())){
+					search.put("TEACHER_ID", getUserID());
+				}
+				if(pd.containsKey("SUBJECT_ID")){
+					search.put("SUBJECT_ID", pd.getString("SUBJECT_ID"));
+				}
 				List<PageData> studentTestList = studenttestService.reportListData(search);
 				studentPageData.put("testList", studentTestList);
@@ -264,10 +264,13 @@ public class LoginController extends BaseController {
 								sData.get("SUBJECT_NAME"));
 						session.setAttribute(USERNAME + Const.TERM_ID,
 								sData.get("TERM_ID"));
+						
 						sData.put("USER_ID", user.getUSER_ID());
 						List<PageData> templateInfos = pagetemplateService.listAll(sData);
 						mv.addObject("templateInfos", templateInfos);
 					}
+					session.setAttribute(USERNAME + Const.ROLE_ID,
+							"teacher");
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
 					mv.setViewName("sunvote/teacher/teacher_main");
 					mv.addObject("user", user);
@@ -301,6 +304,8 @@ public class LoginController extends BaseController {
 						mv.addObject("SNAME", pad.get("SNAME"));
 						mv.addObject("SCHOOL_ID", pad.get("SCHOOL_ID"));
 					}
+					session.setAttribute(USERNAME + Const.ROLE_ID,
+							"admin");
 					mv.addObject("gradeInfos", gradeInfos);
 					mv.addObject("subjectInfos", subjectInfos);
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
@@ -328,6 +333,8 @@ public class LoginController extends BaseController {
 					session.setAttribute(USERNAME + Const.SESSION_QX2,
 							this.getUQX2(USERNAME)); // 副职角色按钮权限放到session中
 				}
+				session.setAttribute(USERNAME + Const.ROLE_ID,
+						"systemadmin");
 				this.getRemortIP(USERNAME); // 更新登录IP
 				menuList = this.changeMenuF(allmenuList, session, USERNAME,
 						changeMenu); // 切换菜单
@@ -26,6 +26,7 @@ public class Const {
 	public static final String SUBJECT_ID = "SUBJECT_ID";
 	public static final String SUBJECT_NAME = "SUBJECT_NAME";
 	public static final String TERM_ID = "TERM_ID";
+	public static final String ROLE_ID = "ROLE_ID";
 	public static final String FALSE = "F";
 	public static final String LOGIN = "/login_toLogin.do";					//登录地址