diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index ea5d709..563a15a 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -262,17 +262,17 @@ } function report(classId){ - //window.open('<%=basePath%>report/report.do?classid=' + classId); - //if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?classid=' + classId)){ - $("#mainFrame").attr('src','<%=basePath%>report/report.do?classid=' + classId); + //window.open('<%=basePath%>report/report.do?role=admin&classid=' + classId); + //if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?role=admin&classid=' + classId)){ + $("#mainFrame").attr('src','<%=basePath%>report/report.do?role=admin&classid=' + classId); window.top.loading.show(); //} } function report2(classId){ //window.open('<%=basePath%>report/report.do?classid=' + classId); //if($("#mainFrame").attr('src') != ('<%=basePath%>report/report.do?classid=' + classId)){ - $("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId); - window.top.loading.show(); + // $("#mainFrame").attr('src','<%=basePath%>teacher/test_list.do?classid=' + classId); + // window.top.loading.show(); //} } @@ -313,8 +313,8 @@ $("#jishice_paper").click(function (){ var path = "../teacher/teach_paper.do?school_id=" + schoolId; //if($("#mainFrame").attr('src') != (path)){ - $("#mainFrame").attr('src',path); - window.top.loading.show(); + // $("#mainFrame").attr('src',path); + // window.top.loading.show(); //} }); diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp index 9af2a45..93ceff4 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_report_1.jsp @@ -33,6 +33,7 @@
+ @@ -40,6 +41,16 @@ + + + --%> - + <%-- --%> diff --git a/WebRoot/static/js/control-604.js b/WebRoot/static/js/control-604.js index 6eafc18..3f11825 100644 --- a/WebRoot/static/js/control-604.js +++ b/WebRoot/static/js/control-604.js @@ -1,8 +1,9 @@ -$(function(){ + var questionNUm = 0 ; +$(function(){ /*快速创建答案列表*/ var score=0; var total_score = 0; - var questionNUm = 0 ; + function creat(str_ans,a_num,fraction){ // $(".section").remove(); answer_index_b=$(".section").length+1; @@ -16,7 +17,7 @@ } } q_num=str.length; - $(".content").append('

第' +answer_index_b +'大题总分: ' + (q_num * fraction)+'分

'); + $(".content").append('

第' +answer_index_b +'大题总分: ' + q_num + ' X ' + fraction + ' = ' + (q_num * fraction)+' 分

'); for(var i=0;i

第' +answer_index_b +'大题总分: ' + ((index_e_2- index_s_2 + 1 )* fraction2)+'分

'); + $(".content").append('

第' +answer_index_b +'大题总分: ' + (index_e_2- index_s_2 + 1 ) + ' X ' + fraction2 + ' = ' + ((index_e_2- index_s_2 + 1 )* fraction2)+' 分

'); for(var i=index_s_2;i<=index_e_2;i++){ questionNUm++; $(".section-" + answer_index_b +" .question_list").append('
'+questionNUm+'、
    '); @@ -379,12 +380,12 @@ function creatHtml(data){ for(var i=0;i

    '+'第'+ (i+1) + '大题总分:'+ data.questions[i].sug_score +''+''+data.questions[i].content+'

    '); + $(".content").append('

    '+'第'+ (i+1) + '大题总分:'+data.questions[i].questions.length + " X " + (parseFloat(data.questions[i].sug_score) / data.questions[i].questions.length) + " = " + data.questions[i].sug_score +''+''+data.questions[i].content+'

    '); }else{ if(i == 0){ $(".content").append('
    '); } - $(".section0").find(".question_list").append('
    '+(i+1)+'、
      '); + $(".section0").find(".question_list").append('
      '+(++questionNUm)+'、
        '); for(var k=0;k'+String.fromCharCode(0x41+k)+''); @@ -401,7 +402,7 @@ function creatHtml(data){ if(data.questions[i].questions){ for(var j=0;j'+(j+1)+'、
          '); + $(".section-"+i).find(".question_list").append('
          '+(++questionNUm)+'、
            '); if($(".section-"+i).find(".que_name").text()=="判断题"){ for(var k=0;k @@ -42,6 +43,7 @@ #{TOTAL_SCORE}, #{REMARK}, #{TEST_TYPE}, + #{SUBJECT_ID}, #{TESTPAPER_ID} @@ -83,6 +85,7 @@ TOTAL_SCORE = #{TOTAL_SCORE}, REMARK = #{REMARK}, TEST_TYPE = #{TEST_TYPE}, + SUBJECT_ID = #{SUBJECT_ID}, TESTPAPER_ID = TESTPAPER_ID where TESTPAPER_ID = #{TESTPAPER_ID} @@ -143,6 +146,9 @@ and (NAME = #{NAME}) + + and (SUBJECT_ID = #{SUBJECT_ID}) + and (TEST_TYPE = #{TEST_TYPE} or TEST_TYPE IS NULL) @@ -185,6 +191,9 @@ and (TEACHER_ID = #{TEACHER_ID}) + + and (SUBJECT_ID = #{SUBJECT_ID}) + and (CREATE_DATE = #{CREATE_DATE}) diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java index 76fc4d2..6752243 100644 --- a/src/com/fh/controller/api/V1.java +++ b/src/com/fh/controller/api/V1.java @@ -1787,7 +1787,9 @@ public class V1 extends BaseController { } } } - testpaperinfoService.batchSave(testInfoPdList); + if(testInfoPdList.size() > 0){ + testpaperinfoService.batchSave(testInfoPdList); + } } res.setData(testPaperId); } catch (Exception e) { diff --git a/src/com/fh/controller/sunvote/paper/PaperController.java b/src/com/fh/controller/sunvote/paper/PaperController.java index 1380bca..c220c3a 100644 --- a/src/com/fh/controller/sunvote/paper/PaperController.java +++ b/src/com/fh/controller/sunvote/paper/PaperController.java @@ -255,10 +255,13 @@ public class PaperController extends BaseController { Session session = Jurisdiction.getSession(); User user = (User)session.getAttribute(Const.SESSION_USER); paper.setUser_id(user.getUSER_ID()); - paper.setPaper_type(paperType == null ? "1" :paperType); - paper.setSubject_id(pd.getString("SUBJECT_ID") == null ? getSubjectId():pd.getString("SUBJECT_ID")); - paper.setGrade_id(pd.getString("GRADE_ID") == null ? getGradeID() : pd.getString("GRADE_ID")); - paper.setSchool_id(pd.getString("SCHOOL_ID") == null ? getSchoolID() : pd.getString("SCHOOL_ID")); + paper.setPaper_type(paperType == null || "".equals(paperType.trim()) ? "1" :paperType); + String subjectId = pd.getString("SUBJECT_ID"); + paper.setSubject_id(subjectId == null || "".equals(subjectId.trim())? getSubjectId():subjectId); + String gradeId = pd.getString("GRADE_ID"); + paper.setGrade_id( gradeId== null || "".equals(gradeId.trim())? getGradeID() : gradeId); + String schoolId = pd.getString("SCHOOL_ID") ; + paper.setSchool_id(schoolId == null || "".equals(schoolId.trim())? getSchoolID() : schoolId); paper.setQuestions(new ArrayList()); pd.put("JSON", paper.toJson()); diff --git a/src/com/fh/controller/sunvote/report/ReportController.java b/src/com/fh/controller/sunvote/report/ReportController.java index 3b38ee6..0573d98 100644 --- a/src/com/fh/controller/sunvote/report/ReportController.java +++ b/src/com/fh/controller/sunvote/report/ReportController.java @@ -14,6 +14,7 @@ import org.springframework.web.servlet.ModelAndView; import com.fh.controller.api.ResponseGson; import com.fh.controller.base.BaseController; +import com.fh.service.api.V1Manager; import com.fh.service.sunvote.sclass.SClassManager; import com.fh.service.sunvote.student.StudentManager; import com.fh.service.sunvote.studenttest.StudentTestManager; @@ -41,6 +42,9 @@ public class ReportController extends BaseController { @Resource(name="testpaperinfoService") private TestPaperInfoManager testpaperinfoService; + @Resource(name = "v1Service") + private V1Manager v1Service; + @RequestMapping(value="/report") @@ -51,7 +55,30 @@ public class ReportController extends BaseController { pd.put("SCLASS_ID", pd.get("CLASSID")); pd.put("ID", pd.get("CLASSID")); pd.put("TEST_TYPE", "1"); - pd.put("TEACHER_ID", getUserID()); + String role = pd.getString("ROLE"); + if( role != null && "admin".equals(role)){ + PageData tpd = new PageData(); + tpd.put("ID", getUserID()); + List adminInfos = v1Service.getAdminInfo(tpd); + List subjectInfos = new ArrayList(); + for(PageData pad : adminInfos){ + PageData tmpd = new PageData(); + Object gradeId = pad.get("GRADE_ID"); + tmpd.put("SNAME", pad.get("SNAME"));// 学校名称 + tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID + tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id + tmpd.put("GNAME", pad.get("GNAME"));//年级名称 + tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id + tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称 + if(gradeId != null && !"".equals(gradeId)){ + }else{ + subjectInfos.add(tmpd); + } + } + mv.addObject("subjectInfos", subjectInfos); + }else{ + pd.put("TEACHER_ID", getUserID()); + } // 1 查询班级信息 PageData classPageData = sclassService.findById(pd); PageData info = new PageData(); @@ -60,6 +87,9 @@ public class ReportController extends BaseController { info.put("CLASS_ID", classPageData.getString("ID")); pd.put("CLASS_ID", pd.get("CLASSID")); List studentList = studentService.listAllClass(pd); + + + // 2查询班级考试 pd.put("TEST_TYPE", "1"); List testpaperList = testpaperService.listAll(pd); @@ -110,6 +140,7 @@ public class ReportController extends BaseController { mv.addObject("info", info); mv.addObject("start_date", pd.get("START_DATE")); mv.addObject("end_date", pd.get("END_DATE")); + mv.addObject("pd", pd); mv.setViewName("sunvote/teacher/teacher_report_1"); return mv; }
            课程统计: ${info.testsize}
            学生人数: ${info.STUDENT_NUM}
            		 + + ${var.RIGHT}
            ${vs.index + 1}
            ${var.detail[vs1.index].ANSWER}
            		style="background:#0bb8b9"div style="width:80px;margin:0 auto;">${var.detail[vs1.index].ANSWER} ${var.OTHER_SCORE}
            ${var.GETSCORE}