修改管理员登录白屏问题

教师首页登录，暂时不显示首页内容

修改管理员登录白屏问题
教师首页登录，暂时不显示首页内容
孙向锦
1 parent 0deda53b
Showing 14 changed files with 242 additions and 25 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp
WebRoot/WEB-INF/jsp/system/index/left.jsp
WebRoot/static/js/paper_view.js
WebRoot/static/js/test_list.js
resources/mybatis1/api/V1Mapper.xml
resources/mybatis1/sunvote/TeacherMapper.xml
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/controller/system/login/LoginController.java
src/com/fh/service/sunvote/teacher/TeacherManager.java
src/com/fh/service/sunvote/teacher/impl/TeacherService.java
@@ -55,9 +55,12 @@
 		<input type="button" value="保存" class="btn btn-primary btn-lg topic save" />
 	</div>
 	</div>
+	<script>
+		var subjectId = '${pd.subject_id}';
+	</script>
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 	<script src="../static/js/echars.js"></script>
-	<script src="../static/js/paper_view.js"></script>
+	<script src="../static/js/paper_view.js?a=2"></script>
 </html>
@@ -143,7 +143,7 @@
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	<script src="../static/js/echars.js"></script>
-	<script src="../static/js/paper_view1.js?a=2"></script>
+	<script src="../static/js/paper_view1.js?a=1"></script>
 </html>
@@ -97,6 +97,9 @@
 		</div><!-- /.modal-content -->
 	  </div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
+	<script>
+		//var subject_id = '${subject_id}' ;
+	</script>
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>   
 	<script src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
 	<script src="../static/js/set_question.js?a=1"></script>
@@ -118,7 +118,7 @@
 		</div>
 	</div>
 	<div class="content_r">
-		<iframe name="mainFrame" id="mainFrame" frameborder="0" src="../teacher/index.do?" width="100%" height="100%"></iframe>
+		<iframe name="mainFrame" id="mainFrame" frameborder="0"  width="100%" height="100%"></iframe>
 	</div>
@@ -49,7 +49,7 @@
 						<th>测验名称</th>
 						<th>班级</th>
 						<th>创建时间</th>
-						<th>查看</th>
+						<th>操作</th>
 					</tr>
 				</thead>
 			</table>
@@ -82,5 +82,5 @@
 	<script type="text/javascript">
 		var user_id= "${pd.userId}";
 	</script>
-	<script src="../static/js/test_list.js?a=2"></script>
+	<script src="../static/js/test_list.js"></script>
 </html>
 \ No newline at end of file
@@ -125,5 +125,7 @@
 				<!-- /section:basics/sidebar.layout.minimize -->
 				<script type="text/javascript">
 					try{ace.settings.check('sidebar' , 'collapsed')}catch(e){}
+					
+					console.log('${menuList}');
 				</script>
 			</div>
 \ No newline at end of file
@@ -18,6 +18,8 @@ function getQueryString(name) {
 	var classId=getQueryString("classId");
 	var userid=getQueryString("userid");
+	var gradleId =  getQueryString("gradleid");
+	
 	var _html="";
 	var question_id_arry="";
 	$(document).ready(function(){
@@ -155,8 +157,8 @@ function getQueryString(name) {
 				title: $("#paper_title").html(),
 				exam_time: $("#time").html(),
 				paper_type: "101",
-				subject_id: "20",
-				grade_id: "",
+				subject_id: subjectId,
+				grade_id: gradleId,
 				class_id: classId,
 				user_id: userid,
 				score: "100",
@@ -77,7 +77,8 @@ function getList(start_date, end_date, class_id) { // 获取测验列表
 								+ data.data[i].createDate
 								+ '</td><td><a onclick="window.top.loading.show();jump($(this));" data-id="'
 								+ data.data[i].testpaperId
-								+ '" >查看</a></td></tr>'
+								+ '" >查看详情</a> &nbsp;&nbsp;&nbsp;&nbsp; <a onclick="window.top.loading.show();ansync($(this)); " data-id="' 
+								+ data.data[i].testpaperId + '" >班级分析</a></td></tr>'
 					}
 					$("#tab_body").html(tab_html);
 				},
@@ -92,6 +93,13 @@ function jump(obj) { // 预览测验详情
 	var id = obj.attr("data-id");
 	location.href = "paper_view1.do?testpaperId=" + id;
 }
+
+function ansync(obj){
+	// 班级分析
+	var id = obj.attr("data-id");
+	location.href = "classansync.do?testpaperId=" + id;
+}
+
 function getSubjectName(id) { // 获取科目中文名
 	var subjectName = "";
 	$.ajax({
@@ -100,7 +100,7 @@
 			FROM
 				sv_paperquestion
 			LEFT JOIN sv_question ON sv_paperquestion.QUESTION_ID = sv_question.QUESTION_ID
-			where 1 = 1 and (sv_question.P_ID = '-1' or sv_question.P_ID = '0')
+			where 1 = 1 and (sv_question.P_ID = '-1' or sv_question.P_ID = '0' or sv_question.P_ID IS NULL)
 			<if test="PAPER_ID != null and PAPER_ID != ''">
 				and sv_paperquestion.PAPER_ID = #{PAPER_ID}
 			</if>
@@ -117,7 +117,7 @@
 			and ACCOUT = #{ACCOUT} and PASSWORD=#{PASSWORD}
 		</if>
 		<if test="KEYPAD_ID !=null">
-		and KEYPAD_ID = #{KEYPAD_ID}
+			and KEYPAD_ID = #{KEYPAD_ID}
 		</if>
 		limit 1
 	</select>
@@ -159,6 +159,91 @@
 		</if>
 	</select>
+	<!-- 根据难度统计班级掌握情况 -->
+	<select id="diffcultClassReport" parameterType="pd" resultType="pd">
+		SELECT
+			sv_question.DIFFICULTY,
+			sv_testpaperinfo.`RIGHT`,
+			count(sv_testpaperinfo.`RIGHT`) AS ANSWER_NUM
+		FROM
+			sv_testpaperinfo
+		LEFT JOIN sv_question ON sv_testpaperinfo.QUESTION_ID = sv_question.QUESTION_ID
+		WHERE
+			sv_testpaperinfo.TEST_ID = #{TEST_ID}
+		GROUP BY
+			sv_question.DIFFICULTY,
+			sv_testpaperinfo.`RIGHT`
+		ORDER BY 
+			sv_question.DIFFICULTY,
+			sv_testpaperinfo.`RIGHT`
+	</select>
+	
+	<!-- 根据难度统计学生掌握掌握情况 -->
+	<select id="diffcultStudentReport" parameterType="pd" resultType="pd">
+		SELECT
+			sv_student.`NAME`,
+			sv_testpaperinfo.STUDENT_ID,
+			sv_question.DIFFICULTY,
+			sv_testpaperinfo.`RIGHT`,
+			count(sv_testpaperinfo.`RIGHT`) AS ANSWER_NUM
+		FROM
+			sv_testpaperinfo
+		LEFT JOIN sv_student ON sv_testpaperinfo.STUDENT_ID = sv_student.ID
+		LEFT JOIN sv_question ON sv_testpaperinfo.QUESTION_ID = sv_question.QUESTION_ID
+		WHERE
+			sv_testpaperinfo.TEST_ID = #{TEST_ID}
+		GROUP BY
+			sv_testpaperinfo.STUDENT_ID,
+			sv_question.DIFFICULTY,
+			sv_testpaperinfo.`RIGHT`
+		ORDER BY
+			sv_student.NUMBER,
+			sv_question.DIFFICULTY,
+			sv_testpaperinfo.`RIGHT`
+	</select>
+
+	<!-- 根据难度统计学生掌握掌握情况 -->
+	<select id="knowadgeClassReport" parameterType="pd" resultType="pd">
+		SELECT
+			sv_knowledge.`NAME`,
+			sv_testpaperinfo.`RIGHT`,
+			count(sv_testpaperinfo.`RIGHT`) AS ANSWER_NUM
+		FROM
+			sv_testpaperinfo
+		LEFT JOIN sv_knowledge ON sv_testpaperinfo.KNOWLEDGE_ID = sv_knowledge.KNOWLEDGE_ID
+		WHERE
+			sv_testpaperinfo.TEST_ID = #{TEST_ID}
+		GROUP BY
+			sv_knowledge.`NAME`,
+			sv_testpaperinfo.`RIGHT`
+		ORDER BY
+			sv_knowledge.KNOWLEDGE_ID,
+			sv_testpaperinfo.`RIGHT`
+	</select> 
+	
+	<!-- 根据难度统计学生掌握掌握情况 -->
+	<select id="knowadgeStudentReport" parameterType="pd" resultType="pd">
+		SELECT
+			sv_student.`NAME` as STUDENT_NAME,
+			sv_testpaperinfo.STUDENT_ID,
+			sv_knowledge.`NAME` as KNOWLEDGE_NAME,
+			sv_knowledge.KNOWLEDGE_ID,
+			sv_testpaperinfo.`RIGHT`,
+			count(sv_testpaperinfo.`RIGHT`) AS ANSWER_NUM
+		FROM
+			sv_testpaperinfo
+		LEFT JOIN sv_knowledge ON sv_testpaperinfo.KNOWLEDGE_ID = sv_knowledge.KNOWLEDGE_ID
+		LEFT JOIN sv_student ON sv_testpaperinfo.STUDENT_ID = sv_student.ID
+		WHERE
+			sv_testpaperinfo.TEST_ID = #{TEST_ID}
+		GROUP BY
+			sv_testpaperinfo.STUDENT_ID,
+			sv_knowledge.`NAME`, 
+			sv_testpaperinfo.`RIGHT`
+		ORDER BY
+			sv_student.NUMBER,sv_knowledge.KNOWLEDGE_ID,sv_testpaperinfo.`RIGHT`
+	</select>
+	
 	<!-- 批量删除 -->
 	<delete id="deleteAll" parameterType="String">
 		delete from
@@ -204,11 +204,24 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("userId", userId);
+		pd.put("subject_id",  getSubjectID(userId));
 		mv.setViewName("sunvote/teacher/paper_view");
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	private String getSubjectID(String userId) {
+		PageData pt = new PageData();
+		pt.put("TEACHER_ID", userId);
+		try {
+			List<PageData> subjectList = v1Service.getTeacherSubjectInfo(pt);
+			if (subjectList != null && subjectList.size() > 0) {
+				return subjectList.get(0).getString("SUBJECT_ID");
+			}
+		}catch(Exception ex){}
+		return null;
+	}
+
 	/**
 	 * 列表
 	 * 
@@ -246,6 +259,63 @@ public class TeacherController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	/**
+	 * 列表
+	 * 
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/classansync")
+	public ModelAndView classansync(Page page) throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "列表Paper");
+		String userId = this.getUserID();
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("userId", userId);
+		if(pd.get("TEST_ID") == null){
+			pd.put("TEST_ID", pd.get("TESTPAPERID"));
+		}
+		List<PageData> diffcultClassList = teacherService.diffcultClassReport(pd);
+		List<PageData> diffcultClass = new ArrayList<PageData>();
+		for(int i = 0 ; i < diffcultClassList.size() ; ){
+			PageData tpd0 = diffcultClassList.get(i);
+			PageData tpd1 = new PageData();
+			PageData data = new PageData();
+			if(i + 1 < diffcultClassList.size()){
+				tpd1 = diffcultClassList.get(i+1);
+			}
+			if(tpd0.get("DIFFICULTY").equals(tpd1.get("DIFFICULTY"))){
+				
+				i= i+2 ;
+			}else{
+				i ++ ;
+			}
+		}
+		
+		
+		mv.setViewName("sunvote/teacher/paper_view1");
+		mv.addObject("pd", pd);
+		return mv;
+	}
+	
+	
+	private String getPensent(PageData p1 , PageData p2){
+		double pencent = 0.0;
+		if(p2 != null){
+			String p1AnswerNum = p1.getString("ANSWER_NUM");
+			String p2AnswerNum = p2.getString("ANSWER_NUM");
+			double d1 = Double.parseDouble(p1AnswerNum);
+			double d2 = Double.parseDouble(p2AnswerNum);
+			pencent = d2 / (d1 + d2) ;
+		}else{
+			if("1".equals(p1.get("RIGHT"))){
+				pencent = 1.0 ;
+			}
+		}
+		return String.format("%.4f", pencent);
+	}
 	/**
 	 * 列表
@@ -385,9 +455,6 @@ public class TeacherController extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "批量删除Teacher");
-		if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {
-			return null;
-		} // 校验权限
 		PageData pd = new PageData();
 		Map<String, Object> map = new HashMap<String, Object>();
 		pd = this.getPageData();
@@ -414,9 +481,6 @@ public class TeacherController extends BaseController {
 	@RequestMapping(value = "/excel")
 	public ModelAndView exportExcel() throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "导出Teacher到excel");
-		if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
-			return null;
-		}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -511,5 +575,7 @@ public class TeacherController extends BaseController {
 		return res.toJson();
 	}
+	
+	
 }
@@ -226,15 +226,15 @@ public class LoginController extends BaseController {
 		try {
 			Session session = Jurisdiction.getSession();
-			User user = (User) session.getAttribute(Const.SESSION_USER); // 读取session中的用户信息(单独用户信息)
+			User user = (User)session.getAttribute(Const.SESSION_USER);						//读取session中的用户信息(单独用户信息)
 			if (user != null) {
-				User userr = (User) session.getAttribute(Const.SESSION_USERROL); // 读取session中的用户信息(含角色信息)
-//				if (null == userr) {
-//					userr = userService.getUserAndRoleById(user.getUSER_ID()); // 通过用户ID读取用户信息和角色信息
-//					session.setAttribute(Const.SESSION_USERROL, user); // 存入session
-//				} else {
-//					user = userr;
-//				}
+				User userr = (User)session.getAttribute(Const.SESSION_USERROL);				//读取session中的用户信息(含角色信息)
+				if(null == userr){
+					user = userService.getUserAndRoleById(user.getUSER_ID());				//通过用户ID读取用户信息和角色信息
+					session.setAttribute(Const.SESSION_USERROL, user);						//存入session	
+				}else{
+					user = userr;
+				}
 				String USERNAME = user.getUSERNAME();
 				if ("teacher".equals(changeMenu)) {
 					PageData tpd = new PageData();
@@ -242,7 +242,7 @@ public class LoginController extends BaseController {
 					List<PageData> teacherInfos = v1Service.getTeacherInfo(tpd);
 					pd.put("TEACHER", teacherInfos);
 					if (teacherInfos != null && teacherInfos.size() > 0) {
-						PageData sData = teacherInfos.get(0);
+						PageData sData = teacherInfos.get(0); 
 						session.setAttribute(USERNAME + Const.SCHOOL_ID,
 								sData.get("SCHOOL_ID"));
 						session.setAttribute(USERNAME + Const.SCHOOL_NAME,
@@ -42,6 +42,34 @@ public interface TeacherManager{
 	 */
 	public List<PageData> listAll(PageData pd)throws Exception;
+	/**
+	 * knowadgeClassReport
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> diffcultClassReport(PageData pd)throws Exception;
+	
+	/**
+	 * diffcultStudentReport
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> diffcultStudentReport(PageData pd)throws Exception;
+	
+	/**
+	 * knowadgeClassReport
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> knowadgeClassReport(PageData pd)throws Exception;
+	
+	/**
+	 * 根据难度统计学生掌握掌握情况
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> knowadgeStudentReport(PageData pd)throws Exception;
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
@@ -88,6 +88,26 @@ public class TeacherService implements TeacherManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("TeacherMapper.deleteAll", ArrayDATA_IDS);
 	}
+
+	@Override
+	public List<PageData> diffcultClassReport(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("TeacherMapper.diffcultClassReport", pd);
+	}
+
+	@Override
+	public List<PageData> diffcultStudentReport(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("TeacherMapper.diffcultStudentReport", pd);
+	}
+
+	@Override
+	public List<PageData> knowadgeClassReport(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("TeacherMapper.knowadgeClassReport", pd);
+	}
+
+	@Override
+	public List<PageData> knowadgeStudentReport(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("TeacherMapper.knowadgeStudentReport", pd);
+	}
 }