孙向锦 / SunvoteEducation

Commit 2e6cd2f36b227a02c7310b16769adce87f10eac9

Authored by jack
2 parents c7b08501 22e695bf

Merge branch 'develop' of http://120.78.57.84/Elvis/SunvoteEducation into develop

Inline Side-by-side
Showing 3 changed files with 243 additions and 0 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit3.jsp 0 → 100644
  View file @2e6cd2f
  1 +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
  2 +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%>
  3 +<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%>
  4 +<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
  5 +<%
  6 + String path = request.getContextPath();
  7 + String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/";
  8 +%>
  9 +<!DOCTYPE html>
  10 +<html lang="en">
  11 + <head>
  12 + <base href="<%=basePath%>">
  13 + <!-- 下拉框 -->
  14 + <link rel="stylesheet" href="static/ace/css/chosen.css" />
  15 + <!-- jsp文件头和头部 -->
  16 + <%@ include file="../../system/index/top.jsp"%>
  17 + <!-- 日期框 -->
  18 + <link rel="stylesheet" href="static/ace/css/datepicker.css" />
  19 + <!-- 编辑页样式覆盖 -->
  20 + <link rel="stylesheet" href="static/css/edit.css" />
  21 +
  22 +</head>
  23 +<body class="no-skin">
  24 +<!-- /section:basics/navbar.layout -->
  25 +<div class="main-container" id="main-container">
  26 + <!-- /section:basics/sidebar -->
  27 + <div class="main-content">
  28 + <div class="main-content-inner">
  29 + <div class="page-content">
  30 + <div class="row">
  31 + <div class="col-xs-12">
  32 +
  33 + <form action="teacher/${msg }.do" name="Form" id="Form" method="post">
  34 + <input type="hidden" name="ID" id="ID" value="${pd.ID}"/>
  35 + <input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
  36 + <input type="hidden" name="SEAT_PHONE" id="SEAT_PHONE" value="${pd.SEAT_PHONE}" maxlength="255" placeholder="这里输入座机电话" title="座机电话" style="width:98%;"/>
  37 + <input type="hidden" name="CARD_NO" id="CARD_NO" value="${pd.CARD_NO}" maxlength="255" placeholder="这里输入证件号" title="证件号" style="width:98%;"/>
  38 + <div id="zhongxin" style="padding-top: 13px;">
  39 + <table id="table_report" class="table">
  40 + <tr>
  41 + <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
  42 + <td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
  43 + </tr>
  44 + <tr>
  45 + <td style="width:75px;text-align: right;padding-top: 13px;">电话:</td>
  46 + <td><input type="text" name="PHONE" id="PHONE" value="${pd.PHONE}" maxlength="255" placeholder="这里输入电话" title="电话" style="width:98%;"/></td>
  47 + </tr>
  48 +
  49 + <tr>
  50 + <td style="width:75px;text-align: right;padding-top: 13px;">账号:</td>
  51 + <td><input type="text" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td>
  52 + </tr>
  53 + <tr>
  54 + <td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
  55 + <td><input type="password" name="PASSWORD" id="PASSWORD" value="${pd.PASSWORD}" maxlength="255" placeholder="这里输入密码" title="密码" style="width:98%;"/></td>
  56 + </tr>
  57 + <tr>
  58 + <td style="width:75px;text-align: right;padding-top: 13px;">性别:</td>
  59 + <td>
  60 + <select class="chosen-select form-control" name="SEX" id="SEX" data-placeholder="选择性别">
  61 + <option value="1" <c:if test="${pd.SEX==1}">selected="true"</c:if>>男</option>
  62 + <option value="2" <c:if test="${pd.SEX==2}">selected="true"</c:if>>女</option>
  63 + </select>
  64 + </td>
  65 + <tr>
  66 + <td style="width:75px;text-align: right;padding-top: 13px;">教师卡编号:</td>
  67 + <td><input type="text" name="KEYPAD_ID" id="KEYPAD_ID" value="${pd.KEYPAD_ID}" maxlength="255" placeholder="这里输入教师卡编号" title="教师卡编号" style="width:98%;"/></td>
  68 + </tr>
  69 + <tr>
  70 + <td style="text-align: center;" colspan="10">
  71 + <a class="btn btn-mini btn-primary" onclick="save();">保存</a>
  72 + <a class="btn btn-mini btn-danger" onclick="window.top.modal.remove();">取消</a>
  73 + </td>
  74 + </tr>
  75 + </table>
  76 + </div>
  77 + <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>
  78 + </form>
  79 + </div>
  80 + <!-- /.col -->
  81 + </div>
  82 + <!-- /.row -->
  83 + </div>
  84 + <!-- /.page-content -->
  85 + </div>
  86 + </div>
  87 + <!-- /.main-content -->
  88 +</div>
  89 +<!-- /.main-container -->
  90 +
  91 +
  92 + <!-- 页面底部js¨ -->
  93 + <%@ include file="../../system/index/foot.jsp"%>
  94 + <!-- 下拉框 -->
  95 + <script src="static/ace/js/chosen.jquery.js"></script>
  96 + <!-- 日期框 -->
  97 + <script src="static/ace/js/date-time/bootstrap-datepicker.js"></script>
  98 + <!--提示框-->
  99 + <script type="text/javascript" src="static/js/jquery.tips.js"></script>
  100 + <script type="text/javascript">
  101 + $(top.hangge());
  102 + //保存
  103 + function save(){
  104 + if($("#SCHOOL_ID").val()==""){
  105 + $("#SCHOOL_ID").tips({
  106 + side:3,
  107 + msg:'请输入所在学校',
  108 + bg:'#AE81FF',
  109 + time:2
  110 + });
  111 + $("#SCHOOL_ID").focus();
  112 + return false;
  113 + }
  114 + if($("#NAME").val()==""){
  115 + $("#NAME").tips({
  116 + side:3,
  117 + msg:'请输入姓名',
  118 + bg:'#AE81FF',
  119 + time:2
  120 + });
  121 + $("#NAME").focus();
  122 + return false;
  123 + }
  124 + if($("#PHONE").val()==""){
  125 + $("#PHONE").tips({
  126 + side:3,
  127 + msg:'请输入电话',
  128 + bg:'#AE81FF',
  129 + time:2
  130 + });
  131 + $("#PHONE").focus();
  132 + return false;
  133 + }
  134 + if($("#SEAT_PHONE").val()==""){
  135 + $("#SEAT_PHONE").tips({
  136 + side:3,
  137 + msg:'请输入座机电话',
  138 + bg:'#AE81FF',
  139 + time:2
  140 + });
  141 + $("#SEAT_PHONE").focus();
  142 + return false;
  143 + }
  144 + if($("#CARD_NO").val()==""){
  145 + $("#CARD_NO").tips({
  146 + side:3,
  147 + msg:'请输入证件号',
  148 + bg:'#AE81FF',
  149 + time:2
  150 + });
  151 + $("#CARD_NO").focus();
  152 + return false;
  153 + }
  154 + if($("#ACCOUT").val()==""){
  155 + $("#ACCOUT").tips({
  156 + side:3,
  157 + msg:'请输入账号',
  158 + bg:'#AE81FF',
  159 + time:2
  160 + });
  161 + $("#ACCOUT").focus();
  162 + return false;
  163 + }
  164 + if($("#PASSWORD").val()==""){
  165 + $("#PASSWORD").tips({
  166 + side:3,
  167 + msg:'请输入密码',
  168 + bg:'#AE81FF',
  169 + time:2
  170 + });
  171 + $("#PASSWORD").focus();
  172 + return false;
  173 + }
  174 + if($("#SEX").val()==""){
  175 + $("#SEX").tips({
  176 + side:3,
  177 + msg:'请输入性别',
  178 + bg:'#AE81FF',
  179 + time:2
  180 + });
  181 + $("#SEX").focus();
  182 + return false;
  183 + }
  184 + if($("#KEYPAD_ID").val()==""){
  185 + $("#KEYPAD_ID").tips({
  186 + side:3,
  187 + msg:'请输入教师卡编号',
  188 + bg:'#AE81FF',
  189 + time:2
  190 + });
  191 + $("#KEYPAD_ID").focus();
  192 + return false;
  193 + }
  194 + $("#Form").submit();
  195 + $("#zhongxin").hide();
  196 + $("#zhongxin2").show();
  197 + }
  198 +
  199 + $(function() {
  200 + //日期框
  201 + $('.date-picker').datepicker({autoclose: true,todayHighlight: true});
  202 + });
  203 + </script>
  204 +</body>
  205 +</html>
0 206 \ No newline at end of file
... ...
src/com/fh/controller/sunvote/homework/HomeworkController.java
  View file @2e6cd2f
... ... @@ -336,6 +336,7 @@ public class HomeworkController extends BaseController {
336 336 stuPd.remove("SEX");
337 337 stuPd.remove("CLASS_ID");
338 338 stuPd.remove("NUMBER");
  339 + stuPd.put("STUDENT_ID", stuPd.get("ID"));
339 340 stuPd.remove("ID");
340 341 }
341 342 for (PageData hpd : homeworkList) {
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @2e6cd2f
... ... @@ -193,6 +193,23 @@ public class TeacherController extends BaseController {
193 193 PageData pd = new PageData();
194 194 pd = this.getPageData();
195 195 teacherService.edit(pd);
  196 + pd.put("USER_ID", pd.getString("ID")); // ID 主键
  197 + pd.put("LAST_LOGIN", ""); // 最后登录时间
  198 + pd.put("IP", ""); // IP
  199 + pd.put("STATUS", "0"); // 状态
  200 + pd.put("SKIN", "default");
  201 + pd.put("RIGHTS", "");
  202 + pd.put("USERNAME", pd.getString("ACCOUT"));
  203 + pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
  204 + pd.put("PASSWORD",
  205 + new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
  206 + .getString("PASSWORD")).toString()); // 密码加密
  207 +
  208 + if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
  209 + userService.saveU(pd); // 执行保存
  210 + FHLOG.save(Jurisdiction.getUsername(),
  211 + "新增系统用户：" + pd.getString("USERNAME"));
  212 + }
196 213 mv.addObject("msg", "success");
197 214 mv.setViewName("save_result2");
198 215 return mv;
... ... @@ -570,6 +587,26 @@ public class TeacherController extends BaseController {
570 587 mv.addObject("pd", pd);
571 588 return mv;
572 589 }
  590 +
  591 + /**
  592 + * 去修改页面
  593 + *
  594 + * @param
  595 + * @throws Exception
  596 + */
  597 + @RequestMapping(value = "/goEdit3")
  598 + public ModelAndView goEdit3() throws Exception {
  599 + ModelAndView mv = this.getModelAndView();
  600 + PageData pd = new PageData();
  601 + pd = this.getPageData();
  602 + pd = teacherService.findById(pd); // 根据ID读取
  603 + mv.setViewName("sunvote/teacher/teacher_edit3");
  604 + List<PageData> schools = schoolService.listAll(pd);
  605 + mv.addObject("schools", schools);
  606 + mv.addObject("msg", "edit2");
  607 + mv.addObject("pd", pd);
  608 + return mv;
  609 + }
573 610  
574 611 /**
575 612 * 批量删除
... ...