diff --git a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp index 4e46bb1..ef8ca86 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp @@ -348,7 +348,7 @@ } function monitor(school_id){ - var path = "../headmaster/list.do?school_id=" + school_id ; + var path = "../headmaster/listcs.do?school_id=" + school_id ; $("#mainFrame").attr('src',path); window.top.loading.show(); } diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp new file mode 100644 index 0000000..430d5b2 --- /dev/null +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp @@ -0,0 +1,150 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> +<% + String path = request.getContextPath(); + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; +%> + + + + + + + + <%@ include file="../../system/index/top.jsp"%> + + + + + + + +
+ +
+
+
+
+
+ +
+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + +
班级: + +
姓名:
用户名:
密码:
联系电话:
+ 保存 + 取消 +
+
+ +
+
+ +
+ +
+ +
+
+ +
+ + + + + <%@ include file="../../system/index/foot.jsp"%> + + + + + + + + + \ No newline at end of file diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp index ca1f970..0d1dbd3 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list.jsp @@ -1,8 +1,6 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" - pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> <% String path = request.getContextPath(); String basePath = request.getScheme() + "://" @@ -11,150 +9,364 @@ %> -中天电子-教育管理系统 - - +<%@ include file="../../system/index/top.jsp"%> - - - - -
- - -
-
-
-

- 班长管理 -

+ +
+ +
+
+
+
+
+ + + + + + + + + + + + + + +
+
+ + + + +
+ 		+ +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + 序号姓名用户名密码所在学校权限联系电话操作
+ + ${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.SCHOOL_ID}${var.PERMISSION}${var.PHONE} + + + + + +
您无权查看
没有相关数据
+
+ + + + + +
+ + 新增 + + + + +
+
+ + +
+ +
+
-
+
-
- - - - - - - - - - - - - - - - - - - -
序号姓名用户名密码联系电话操作
-
- -
- -
-
- - - - - - - - - - - - - - - - - - - - + + + + + + - - - - - - - - - -
${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.PHONE}
没有相关数据
-
-
- -
-
- -
- -
- -
-
-
-
<%@ include file="../../system/index/foot.jsp"%> - + + + + + + + + + + diff --git a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp index 0d1dbd3..c7174a0 100644 --- a/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp +++ b/WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp @@ -1,6 +1,8 @@ -<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%> +<%@ page language="java" contentType="text/html; charset=UTF-8" + pageEncoding="UTF-8"%> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> +<%@ taglib prefix="myelfun" uri="/WEB-INF/tld/elfun.tld"%> <% String path = request.getContextPath(); String basePath = request.getScheme() + "://" @@ -9,364 +11,152 @@ %> +中天电子-教育管理系统 + -<%@ include file="../../system/index/top.jsp"%> + + + - -
- -
-
-
-
-
- - -
- - - - - - - - - - - -
-
- - - - -
- 		- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - 序号姓名用户名密码所在学校权限联系电话操作
- - ${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.SCHOOL_ID}${var.PERMISSION}${var.PHONE} - - - - - -
您无权查看
没有相关数据
-
- - - - - -
- - 新增 - - - - -
-
-
- -
- -
- + + +
+ + +
+
+
+

+ 班长管理 +

- +
+
+
+ + + + + + + + + + + + + + + + + + + + +
序号姓名用户名密码联系电话班级操作
-
- - - - - +
+ +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
${vs.index+1}${var.NAME}${var.USERNAME}${var.PASSWORD}${var.PHONE}${var.CLASS_NAME}
没有相关数据
+
+
+ +
+
+ +
+ +
+ +
+
+
+
<%@ include file="../../system/index/foot.jsp"%> - - - - - - - - - - + diff --git a/resources/mybatis1/sunvote/HeadmasterMapper.xml b/resources/mybatis1/sunvote/HeadmasterMapper.xml index e967df5..b83e497 100644 --- a/resources/mybatis1/sunvote/HeadmasterMapper.xml +++ b/resources/mybatis1/sunvote/HeadmasterMapper.xml @@ -78,6 +78,16 @@ + + + + + + + + + + + + update + sv_sclass + set + HEADMASTER_ID = #{HEADMASTER_ID} + where + ID = #{ID} + + + delete from diff --git a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java index 6b524e1..7da5cd5 100644 --- a/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java +++ b/src/com/fh/controller/sunvote/headmaster/HeadmasterController.java @@ -58,6 +58,27 @@ public class HeadmasterController extends BaseController { return mv; } + /**保存 + * @param + * @throws Exception + */ + @RequestMapping(value="/save2") + public ModelAndView save2() throws Exception{ + logBefore(logger, Jurisdiction.getUsername()+"新增Headmaster"); + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd.put("HEADMASTER_ID", this.get32UUID()); //主键 + headmasterService.save(pd); + PageData classPageData = new PageData(); + classPageData.put("ID", pd.get("CLASS_ID")); + classPageData.put("HEADMASTER_ID", pd.get("HEADMASTER_ID")); + headmasterService.updateHeaderMaster(classPageData); + mv.addObject("msg","success"); + mv.setViewName("save_result2"); + return mv; + } + /**删除 * @param out * @throws Exception @@ -129,7 +150,7 @@ public class HeadmasterController extends BaseController { pd.put("keywords", keywords.trim()); } page.setPd(pd); - List varList = headmasterService.list(page); //列出Headmaster列表 + List varList = headmasterService.listClass(page); //列出Headmaster列表 mv.setViewName("sunvote/headmaster/headmaster_list2"); mv.addObject("varList", varList); mv.addObject("pd", pd); @@ -151,6 +172,23 @@ public class HeadmasterController extends BaseController { return mv; } + /**去新增页面 + * @param + * @throws Exception + */ + @RequestMapping(value="/goAdd2") + public ModelAndView goAdd2()throws Exception{ + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + mv.setViewName("sunvote/headmaster/headmaster_edit2"); + List classes = headmasterService.listNoHeaderClass(pd); + mv.addObject("classes",classes); + mv.addObject("msg", "save2"); + mv.addObject("pd", pd); + return mv; + } + /**去修改页面 * @param * @throws Exception @@ -167,6 +205,27 @@ public class HeadmasterController extends BaseController { return mv; } + /**去修改页面 + * @param + * @throws Exception + */ + @RequestMapping(value="/goEdit2") + public ModelAndView goEdit2()throws Exception{ + ModelAndView mv = this.getModelAndView(); + PageData pd = new PageData(); + pd = this.getPageData(); + pd = headmasterService.findById(pd); //根据ID读取 + 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); + mv.addObject("classes",classes); + mv.setViewName("sunvote/headmaster/headmaster_edit2"); + mv.addObject("msg", "edit"); + mv.addObject("pd", pd); + return mv; + } + /**批量删除 * @param * @throws Exception diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java index 7d2ef67..1c34b50 100644 --- a/src/com/fh/controller/sunvote/homework/HomeworkController.java +++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java @@ -29,6 +29,7 @@ import com.fh.service.sunvote.coursemanagement.CourseManagementManager; import com.fh.service.sunvote.homework.HomeworkManager; import com.fh.service.sunvote.homework.HomeworkReportManager; import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager; +import com.fh.service.sunvote.student.StudentManager; import com.fh.util.AppUtil; import com.fh.util.Jurisdiction; import com.fh.util.ObjectExcelView; @@ -56,6 +57,9 @@ public class HomeworkController extends BaseController { @Resource(name="homeworkReporService") private HomeworkReportManager homeworkReporkService; + + @Resource(name="studentService") + private StudentManager studentService; /** * 保存 @@ -247,7 +251,12 @@ public class HomeworkController extends BaseController { 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){ diff --git a/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java b/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java index 63070f9..f61f10d 100644 --- a/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java +++ b/src/com/fh/service/sunvote/headmaster/HeadmasterManager.java @@ -30,11 +30,27 @@ public interface HeadmasterManager{ */ public void edit(PageData pd)throws Exception; + /**修改 + * @param pd + * @throws Exception + */ + public void updateHeaderMaster(PageData pd)throws Exception; + /**列表 * @param page * @throws Exception */ public List list(Page page)throws Exception; + /**列表 + * @param page + * @throws Exception + */ + public List listClass(Page page)throws Exception; + /**列表 + * @param page + * @throws Exception + */ + public List listNoHeaderClass(PageData pd)throws Exception; /**列表(全部) * @param pd @@ -47,6 +63,11 @@ public interface HeadmasterManager{ * @throws Exception */ public PageData findById(PageData pd)throws Exception; + /**通过id获取数据 + * @param pd + * @throws Exception + */ + public PageData findClassByHeaderId(PageData pd)throws Exception; /**通过id获取数据 * @param pd diff --git a/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java b/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java index 33968f0..3960c46 100644 --- a/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java +++ b/src/com/fh/service/sunvote/headmaster/impl/HeadmasterService.java @@ -1,8 +1,11 @@ package com.fh.service.sunvote.headmaster.impl; import java.util.List; + import javax.annotation.Resource; + import org.springframework.stereotype.Service; + import com.fh.dao.DaoSupport; import com.fh.entity.Page; import com.fh.util.PageData; @@ -85,6 +88,30 @@ public class HeadmasterService implements HeadmasterManager{ public void deleteAll(String[] ArrayDATA_IDS)throws Exception{ dao.delete("HeadmasterMapper.deleteAll", ArrayDATA_IDS); } + + + @Override + @SuppressWarnings("unchecked") + public List listClass(Page page) throws Exception { + return (List)dao.findForList("HeadmasterMapper.dataClasslistPage", page); + } + + @Override + @SuppressWarnings("unchecked") + public List listNoHeaderClass(PageData pd) throws Exception { + return (List)dao.findForList("HeadmasterMapper.listNoHeaderClass", pd); + } + + @Override + public void updateHeaderMaster(PageData pd) throws Exception { + dao.update("HeadmasterMapper.updateHeaderMaster", pd); + + } + + @Override + public PageData findClassByHeaderId(PageData pd) throws Exception { + return (PageData)dao.findForObject("HeadmasterMapper.findClassByHeaderId", pd); + } }