diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
new file mode 100644
index 0000000..dca2ff4
--- /dev/null
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp
@@ -0,0 +1,205 @@
+<%@ 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+"/";
+%>
+<!DOCTYPE html>
+<html lang="en">
+	<head>
+	<base href="<%=basePath%>">
+	<!-- 下拉框 -->
+	<link rel="stylesheet" href="static/ace/css/chosen.css" />
+	<!-- jsp文件头和头部 -->
+	<%@ include file="../../system/index/top.jsp"%>
+	<!-- 日期框 -->
+	<link rel="stylesheet" href="static/ace/css/datepicker.css" />
+	<!-- 编辑页样式覆盖 -->
+	<link rel="stylesheet" href="static/css/edit.css" />
+	
+</head>
+<body class="no-skin">
+<!-- /section:basics/navbar.layout -->
+<div class="main-container" id="main-container">
+	<!-- /section:basics/sidebar -->
+	<div class="main-content">
+		<div class="main-content-inner">
+			<div class="page-content">
+				<div class="row">
+					<div class="col-xs-12">
+					
+					<form action="teacher/${msg }.do" name="Form" id="Form" method="post">
+						<input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
+						<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
+						<input type="hidden" name="SEAT_PHONE" id="SEAT_PHONE" value="${pd.SEAT_PHONE}" maxlength="255" placeholder="这里输入座机电话" title="座机电话" style="width:98%;"/>
+						<input type="hidden" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/>
+						<div id="zhongxin" style="padding-top: 13px;">
+						<table id="table_report" class="table">
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
+								<td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">电话:</td>
+								<td><input type="text" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td>
+							</tr>
+							
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">账号:</td>
+								<td><input type="text" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
+								<td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
+								<td>
+								<select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="选择性别">
+										<option value="1"  <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
+										<option value="2"  <c:if test="${pd.SEX==2}">selected="true"</c:if>>女</option>
+								</select>
+								</td>
+							<tr>
+								<td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td>
+								<td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
+							</tr>
+							<tr>
+								<td style="text-align: center;" colspan="10">
+									<a class="btn btn-mini btn-primary" onclick="save();">保存</a>
+									<a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
+								</td>
+							</tr>
+						</table>
+						</div>
+						<div id="zhongxin2" class="center" style="display:none"><br/><br/><br/><br/><br/><img src="static/images/jiazai.gif" /><br/><h4 class="lighter block green">提交中...</h4></div>
+					</form>
+					</div>
+					<!-- /.col -->
+				</div>
+				<!-- /.row -->
+			</div>
+			<!-- /.page-content -->
+		</div>
+	</div>
+	<!-- /.main-content -->
+</div>
+<!-- /.main-container -->
+
+
+	<!-- 页面底部js¨ -->
+	<%@ include file="../../system/index/foot.jsp"%>
+	<!-- 下拉框 -->
+	<script src="static/ace/js/chosen.jquery.js"></script>
+	<!-- 日期框 -->
+	<script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
+	<!--提示框-->
+	<script type="text/javascript" src="static/js/jquery.tips.js"></script>
+		<script type="text/javascript">
+		$(top.hangge());
+		//保存
+		function save(){
+			if($("#SCHOOL_ID").val()==""){
+				$("#SCHOOL_ID").tips({
+					side:3,
+		            msg:'请输入所在学校',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SCHOOL_ID").focus();
+			return false;
+			}
+			if($("#NAME").val()==""){
+				$("#NAME").tips({
+					side:3,
+		            msg:'请输入姓名',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#NAME").focus();
+			return false;
+			}
+			if($("#PHONE").val()==""){
+				$("#PHONE").tips({
+					side:3,
+		            msg:'请输入电话',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PHONE").focus();
+			return false;
+			}
+			if($("#SEAT_PHONE").val()==""){
+				$("#SEAT_PHONE").tips({
+					side:3,
+		            msg:'请输入座机电话',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SEAT_PHONE").focus();
+			return false;
+			}
+			if($("#CARD_NO").val()==""){
+				$("#CARD_NO").tips({
+					side:3,
+		            msg:'请输入证件号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#CARD_NO").focus();
+			return false;
+			}
+			if($("#ACCOUT").val()==""){
+				$("#ACCOUT").tips({
+					side:3,
+		            msg:'请输入账号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#ACCOUT").focus();
+			return false;
+			}
+			if($("#PASSWORD").val()==""){
+				$("#PASSWORD").tips({
+					side:3,
+		            msg:'请输入密码',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#PASSWORD").focus();
+			return false;
+			}
+			if($("#SEX").val()==""){
+				$("#SEX").tips({
+					side:3,
+		            msg:'请输入性别',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#SEX").focus();
+			return false;
+			}
+			if($("#KEYPAD_ID").val()==""){
+				$("#KEYPAD_ID").tips({
+					side:3,
+		            msg:'请输入教师卡编号',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#KEYPAD_ID").focus();
+			return false;
+			}
+			$("#Form").submit();
+			$("#zhongxin").hide();
+			$("#zhongxin2").show();
+		}
+		
+		$(function() {
+			//日期框
+			$('.date-picker').datepicker({autoclose: true,todayHighlight: true});
+		});
+		</script>
+</body>
+</html>
\ No newline at end of file
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 9113313..d572136 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -336,6 +336,7 @@ public class HomeworkController extends BaseController {
 				stuPd.remove("SEX");
 				stuPd.remove("CLASS_ID");
 				stuPd.remove("NUMBER");
+				stuPd.put("STUDENT_ID", stuPd.get("ID"));
 				stuPd.remove("ID");
 			}
 			for (PageData hpd : homeworkList) {
diff --git a/src/com/fh/controller/sunvote/teacher/TeacherController.java b/src/com/fh/controller/sunvote/teacher/TeacherController.java
index 434bc57..fc1a047 100644
--- a/src/com/fh/controller/sunvote/teacher/TeacherController.java
+++ b/src/com/fh/controller/sunvote/teacher/TeacherController.java
@@ -193,6 +193,23 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		teacherService.edit(pd);
+		pd.put("USER_ID", pd.getString("ID")); // ID 主键
+		pd.put("LAST_LOGIN", ""); // 最后登录时间
+		pd.put("IP", ""); // IP
+		pd.put("STATUS", "0"); // 状态
+		pd.put("SKIN", "default");
+		pd.put("RIGHTS", "");
+		pd.put("USERNAME", pd.getString("ACCOUT"));
+		pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
+		pd.put("PASSWORD",
+				new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
+						.getString("PASSWORD")).toString()); // 密码加密
+		
+		if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
+			userService.saveU(pd); // 执行保存
+			FHLOG.save(Jurisdiction.getUsername(),
+					"新增系统用户：" + pd.getString("USERNAME"));
+		}
 		mv.addObject("msg", "success");
 		mv.setViewName("save_result2");
 		return mv;
@@ -570,6 +587,26 @@ public class TeacherController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	/**
+	 * 去修改页面
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/goEdit3")
+	public ModelAndView goEdit3() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd = teacherService.findById(pd); // 根据ID读取
+		mv.setViewName("sunvote/teacher/teacher_edit3");
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools", schools);
+		mv.addObject("msg", "edit2");
+		mv.addObject("pd", pd);
+		return mv;
+	}
 
 	/**
 	 * 批量删除

姓名:
电话:
账号:
密码:
性别:	+ +
教师卡编号:
+ 保存 + 取消 +