diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp index 430d5b2..593e332 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp @@ -36,7 +36,7 @@ 班级: - disabled="disabled" data-placeholder="这里输入所属学校"> diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp index c7174a0..f314f81 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp @@ -133,7 +133,7 @@ function edit(Id){ window.top.modal.init({ 'title':'修改信息', - 'url':'<%=basePath%>headmaster/goEdit.do?HEADMASTER_ID='+Id, + 'url':'<%=basePath%>headmaster/goEdit2.do?HEADMASTER_ID='+Id, func:function() { tosearch(); } diff --git a/WebRoot/WEB-INF/jsp/system/index/login.jsp b/WebRoot/WEB-INF/jsp/system/index/login.jsp index ba8c8b3..89faeb5 100644 --- a/WebRoot/WEB-INF/jsp/system/index/login.jsp +++ b/WebRoot/WEB-INF/jsp/system/index/login.jsp @@ -63,8 +63,8 @@
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml index 74711de..be755ef 100644 --- a/resources/mybatis1/sunvote/HomeworkMapper.xml +++ b/resources/mybatis1/sunvote/HomeworkMapper.xml @@ -221,12 +221,16 @@ and TEACHER_ID = #{TEACHER_ID} - - and COMPLETE_DATE > #{COMPLETE_DATE} + + and COMPLETE_DATE = #{COMPLETE_DATE} - - and IS_DELETE is null - + + and COMPLETE_DATE < #{START_DATE} + + + and COMPLETE_DATE < #{END_DATE} + + ORDER BY COMPLETE_DATE DESC @@ -291,7 +295,14 @@ and sv_homework.HOMEWORK_ID = #{HOMEWORK_ID} - ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO + + and COMPLETE_DATE < #{START_DATE} + + + and COMPLETE_DATE < #{END_DATE} + + and sv_homework.COMPLETE_COUNT > 0 + ORDER BY sv_homework.COMPLETE_DATE ,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO diff --git a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java index 7da5cd5..3f51155 100644 --- a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java +++ b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java @@ -218,7 +218,8 @@ public class HeadmasterController extends BaseController { PageData classPageData = headmasterService.findClassByHeaderId(pd); pd.put("CLASS_ID", classPageData.get("ID")); pd.put("CLASS_NAME", classPageData.get("CLASS_NAME")); - List classes = headmasterService.listNoHeaderClass(pd); + List classes = new ArrayList(); + classes.add(classPageData); mv.addObject("classes",classes); mv.setViewName("sunvote/headmaster/headmaster_edit2"); mv.addObject("msg", "edit"); diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 1c34b50..c99a0a3 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -4,6 +4,7 @@ import java.io.PrintWriter; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.ArrayList; +import java.util.Calendar; import java.util.Date; import java.util.HashMap; import java.util.List; @@ -234,6 +235,28 @@ public class HomeworkController extends BaseController { } + public static String getWeekStart(int cur){ + SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd"); + Calendar ca = Calendar.getInstance(); + ca.setFirstDayOfWeek(Calendar.MONDAY); + int a = ca.getFirstDayOfWeek(); + ca.set(Calendar.DAY_OF_WEEK, a); // Sunday + ca.add(Calendar.DATE, cur * 7); + String weekEnd = format.format(ca.getTime()); + return weekEnd; + } + + public static String getWeekEnd(int cur){ + SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd"); + Calendar ca = Calendar.getInstance(); + ca.setFirstDayOfWeek(Calendar.MONDAY); + int a = ca.getFirstDayOfWeek(); + ca.set(Calendar.DAY_OF_WEEK, a+6); // Sunday + ca.add(Calendar.DATE, cur * 7); + String weekEnd = format.format(ca.getTime()); + return weekEnd + " 23:59:59"; + } + /** * 去修改页面 @@ -247,34 +270,76 @@ public class HomeworkController extends BaseController { PageData pd = new PageData(); pd = this.getPageData(); pd.put("TEACHER_ID", getTeacherID()); + + + if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){ + pd.put("CURRENT_WEEK", "0"); + String currentWeek = pd.getString("CURRENT_WEEK"); + int current = Integer.parseInt(currentWeek); + pd.put("START_DATE", getWeekStart(current)); + pd.put("END_DATE", getWeekEnd(current)); + }else if(pd.get("CURRENT_WEEK") != null){ + String currentWeek = pd.getString("CURRENT_WEEK"); + int current = Integer.parseInt(currentWeek); + pd.put("START_DATE", getWeekStart(current)); + pd.put("END_DATE", getWeekEnd(current)); + } + + // 班级信息 List list = coursemanagementService.listTeacherClass(pd); - for(PageData ptd : list){ - - ptd.put("CLASS_ID", ptd.get("ID")); - List studentList = studentService.findByClassId(ptd); - int studentNum = 0 ; - if(studentList != null){ - studentNum = studentList.size(); - } - ptd.put("STUDENT_NUM", studentNum); - ptd.put("TEACHER_ID", pd.get("TEACHER_ID")); - List homeworkList = homeworkService.listAll(ptd); - for(PageData hpd:homeworkList){ - List dataList = homeworkService.report(hpd); - hpd.put("STUDENTS", dataList); - hpd.remove("TEACHER_ID"); - hpd.remove("CLASS_TYPE"); - hpd.remove("BASESTATION_ID"); - hpd.remove("SCHOOL_ID"); - hpd.remove("GRADE_ID"); - hpd.remove("ID"); + for(PageData temp : list){ + temp.remove("HEADMASTER_ID"); + temp.remove("SCHOOL_ID"); + temp.remove("GRADE_ID"); + temp.remove("TEACHER_ID"); + temp.remove("KEYBOARD_TYPE"); + temp.remove("BASESTATION_ID"); + temp.put("CLASS_ID", temp.get("ID")); + temp.remove("ID"); + } + if(pd.get("CLASS_ID") == null && list.size() > 0){ + pd.put("CLASS_ID", list.get(0).get("CLASS_ID")); + } + pd.put("CLASSES", list); + + // 对应班级数据 + PageData data = new PageData(); + List studentList = studentService.findByClassId(pd); + + List homeworkList = homeworkService.listAll(pd); + List dataList = homeworkService.report(pd); + for(PageData stuPd:studentList){ + for(PageData dpd : dataList){ + if(dpd.get("STUDENT_ID").equals(stuPd.get("ID"))){ + stuPd.put(dpd.get("HOMEWORK_ID"), dpd.get("GET_SCORE")); + } } - ptd.put("HOMEWORKS", homeworkList); + stuPd.remove("SCHOOL_ID"); + stuPd.remove("SEX"); + stuPd.remove("CLASS_ID"); + stuPd.remove("NUMBER"); + stuPd.remove("ID"); + } + for(PageData hpd: homeworkList){ + hpd.remove("QUESTION_COUNT"); + hpd.remove("COMPLETE_COUNT"); + hpd.remove("SUBJECT_ID"); + hpd.remove("SCHOOL_ID"); + hpd.remove("GRADE_ID"); + hpd.remove("SUMBIT_DATE"); + hpd.remove("MODIFY_DATE"); + hpd.remove("TEACHER_ID"); + hpd.remove("CREATE_DATE"); + hpd.remove("CLASS_ID"); + hpd.remove("CODE"); + hpd.remove("GET_MAX_SCORE"); + hpd.remove("HOMEWORK_DESC"); + hpd.remove("COMPLETE_DESC"); } - pd.put("CLASS", list); - pd.remove("JSON"); - pd.remove("JSON"); - pd.remove("ID"); + data.put("HOMEWORKS", homeworkList);// + data.put("STUDENTS", studentList); + + pd.put("DATA", data); mv.setViewName("sunvote/homework/homework_report"); mv.addObject("pd", pd); return mv;