diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp index 58de136..ffd8734 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view.jsp @@ -55,9 +55,12 @@ + - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp index e5b9041..2c0fad8 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/paper_view1.jsp @@ -143,7 +143,7 @@ - + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp index 95be34f..d0601e5 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/set_question.jsp @@ -97,6 +97,9 @@ + diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp index 977db73..7deae4e 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp @@ -118,7 +118,7 @@
- +
diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp index d8931f8..b436b4f 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/test_list.jsp @@ -49,7 +49,7 @@ 测验名称 班级 创建时间 - 查看 + 操作 @@ -82,5 +82,5 @@ - + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/system/index/left.jsp b/WebRoot/WEB-INF/jsp/system/index/left.jsp index 15f5df4..3e2c25b 100644 --- a/WebRoot/WEB-INF/jsp/system/index/left.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/left.jsp @@ -125,5 +125,7 @@ \ No newline at end of file diff --git a/WebRoot/static/js/paper_view.js b/WebRoot/static/js/paper_view.js index 460e405..bc43ef1 100644 --- a/WebRoot/static/js/paper_view.js +++ b/WebRoot/static/js/paper_view.js @@ -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", diff --git a/WebRoot/static/js/test_list.js b/WebRoot/static/js/test_list.js index 01c1f74..9db78b9 100644 --- a/WebRoot/static/js/test_list.js +++ b/WebRoot/static/js/test_list.js @@ -77,7 +77,8 @@ function getList(start_date, end_date, class_id) { // 获取测验列表 + data.data[i].createDate + '查看' + + '" >查看详情      班级分析' } $("#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({ diff --git a/resources/mybatis1/api/V1Mapper.xml b/resources/mybatis1/api/V1Mapper.xml index ce64ebf..6a9ba1a 100644 --- a/resources/mybatis1/api/V1Mapper.xml +++ b/resources/mybatis1/api/V1Mapper.xml @@ -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) and sv_paperquestion.PAPER_ID = #{PAPER_ID} diff --git a/resources/mybatis1/sunvote/TeacherMapper.xml b/resources/mybatis1/sunvote/TeacherMapper.xml index 114109d..86fc7fc 100644 --- a/resources/mybatis1/sunvote/TeacherMapper.xml +++ b/resources/mybatis1/sunvote/TeacherMapper.xml @@ -117,7 +117,7 @@ and ACCOUT = #{ACCOUT} and PASSWORD=#{PASSWORD} - and KEYPAD_ID = #{KEYPAD_ID} + and KEYPAD_ID = #{KEYPAD_ID} limit 1 @@ -159,6 +159,91 @@ + + + + + + + + + + + + delete from diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java index 4deddf0..3b33f6e 100644 --- a/src/com/fh/controller/sunvote/teacher/TeacherController.java +++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java @@ -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 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 diffcultClassList = teacherService.diffcultClassReport(pd); + List diffcultClass = new ArrayList(); + 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 map = new HashMap(); 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(); } + + } diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java index f07ea2a..b9ee589 100644 --- a/src/com/fh/controller/system/login/LoginController.java +++ b/src/com/fh/controller/system/login/LoginController.java @@ -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 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, diff --git a/src/com/fh/service/sunvote/teacher/TeacherManager.java b/src/com/fh/service/sunvote/teacher/TeacherManager.java index c426ba3..4f90751 100644 --- a/src/com/fh/service/sunvote/teacher/TeacherManager.java +++ b/src/com/fh/service/sunvote/teacher/TeacherManager.java @@ -42,6 +42,34 @@ public interface TeacherManager{ */ public List listAll(PageData pd)throws Exception; + /** + * knowadgeClassReport + * @param pd + * @throws Exception + */ + public List diffcultClassReport(PageData pd)throws Exception; + + /** + * diffcultStudentReport + * @param pd + * @throws Exception + */ + public List diffcultStudentReport(PageData pd)throws Exception; + + /** + * knowadgeClassReport + * @param pd + * @throws Exception + */ + public List knowadgeClassReport(PageData pd)throws Exception; + + /** + * 根据难度统计学生掌握掌握情况 + * @param pd + * @throws Exception + */ + public List knowadgeStudentReport(PageData pd)throws Exception; + /**通过id获取数据 * @param pd * @throws Exception diff --git a/src/com/fh/service/sunvote/teacher/impl/TeacherService.java b/src/com/fh/service/sunvote/teacher/impl/TeacherService.java index 25e2638..b3a7692 100644 --- a/src/com/fh/service/sunvote/teacher/impl/TeacherService.java +++ b/src/com/fh/service/sunvote/teacher/impl/TeacherService.java @@ -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 diffcultClassReport(PageData pd) throws Exception { + return (List)dao.findForList("TeacherMapper.diffcultClassReport", pd); + } + + @Override + public List diffcultStudentReport(PageData pd) throws Exception { + return (List)dao.findForList("TeacherMapper.diffcultStudentReport", pd); + } + + @Override + public List knowadgeClassReport(PageData pd) throws Exception { + return (List)dao.findForList("TeacherMapper.knowadgeClassReport", pd); + } + + @Override + public List knowadgeStudentReport(PageData pd) throws Exception { + return (List)dao.findForList("TeacherMapper.knowadgeStudentReport", pd); + } }