孙向锦 / SunvoteEducation

Commit 8246d00caf15d8cd787ef59c7e98b887b3977d9b

Authored by 孙向锦
1 parent 837ae11d

修复bug

Inline Side-by-side
Showing 13 changed files with 210 additions and 130 deletions
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
  View file @8246d00
... ... @@ -71,7 +71,7 @@
71 71 value="${var.ID}" />${vs.index+1}</td>
72 72 <td class='center'>${var.CNAME}</td>
73 73 <td class='center'>${var.ENAME}</td>
74   - <td><a onclick="edit('${var.ID}');" style="margin-right:10px;"><img src="static/images/eidtor.png" /></a><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
  74 + <td><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
75 75  
76 76 </tr>
77 77  
... ... @@ -134,11 +134,22 @@
134 134 }
135 135 }
136 136 if(str==''){
137   -
  137 + if(Id != ''){
  138 + $.ajax({
  139 + type: "POST",
  140 + url: '<%=basePath%>schoolgradesubject/deleteAll.do?tm='+new Date().getTime(),
  141 + data: {DATA_IDS:Id},
  142 + dataType:'json',
  143 + cache: false,
  144 + success: function(data){
  145 + tosearch();
  146 + }
  147 + });
  148 + }
138 149 }else{
139 150 $.ajax({
140 151 type: "POST",
141   - url: '<%=basePath%>subject/deleteAll.do?tm='+new Date().getTime(),
  152 + url: '<%=basePath%>schoolgradesubject/deleteAll.do?tm='+new Date().getTime(),
142 153 data: {DATA_IDS:str},
143 154 dataType:'json',
144 155 //beforeSend: validateData,
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
  View file @8246d00
... ... @@ -32,20 +32,10 @@
32 32  
33 33 <form action="teacher/${msg }.do" name="Form" id="Form" method="post">
34 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}"/>
35 36 <div id="zhongxin" style="padding-top: 13px;">
36 37 <table id="table_report" class="table">
37 38 <tr>
38   - <td style="width:75px;text-align: right;padding-top: 13px;">所在学校:</td>
39   - <td>
40   - <select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
41   - <c:forEach var="item" items="${schools}">
42   - <option value="${item.ID}" <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
43   - </c:forEach>
44   - </select>
45   - </td>
46   - <%-- <input type="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td> --%>
47   - </tr>
48   - <tr>
49 39 <td style="width:75px;text-align: right;padding-top: 13px;">姓名:</td>
50 40 <td><input type="text" name="NAME" id="NAME" value="${pd.NAME}" maxlength="255" placeholder="这里输入姓名" title="姓名" style="width:98%;"/></td>
51 41 </tr>
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
  View file @8246d00
... ... @@ -105,7 +105,7 @@
105 105 </table>
106 106 <div class="footer" style="width:auto">
107 107 <div class="creat">
108   - <input type="button" onclick="$('.title_time').modal('show');" value="添加老师" />
  108 + <input type="button" onclick="add();" value="添加老师" />
109 109 </div>
110 110 <div class="removeAll">
111 111 <input type="button" onclick="deleteAll()" value="删除" />
... ... @@ -209,7 +209,18 @@
209 209 function edit(Id){
210 210 window.top.modal.init({
211 211 'title':'修改信息',
212   - 'url':'<%=basePath%>teacher/goEdit2.do?ID='+Id,
  212 + 'url':'<%=basePath%>teacher/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id,
  213 + func:function() {
  214 + tosearch();
  215 + }
  216 + });
  217 + window.top.modal.show();
  218 + }
  219 +
  220 + function add(){
  221 + window.top.modal.init({
  222 + 'title':'添加教师',
  223 + 'url':'<%=basePath%>teacher/goAdd2.do?school_id=${pd.SCHOOL_ID}',
213 224 func:function() {
214 225 tosearch();
215 226 }
... ...
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
  View file @8246d00
... ... @@ -48,73 +48,67 @@
48 48 </div>
49 49 <div class="name">
50 50 <p>欢迎！</p>
51   - <p id="name">${pd.TEACHER[0].TEACHER_NAME }</p>
52   - <p id="school">${pd.TEACHER[0].SCHOOL_NAME }</p>
  51 + <p id="name">${pd.TEACHER.TNAME }</p>
  52 + <p id="school">${pd.TEACHER.SNAME }</p>
53 53 </div>
  54 + <br/>
  55 + <br/>
  56 + <br/>
54 57 </div>
55   - <div class="class tab1">
56   - <p>
57   - 班级管理<span class="right jiao"></span>
58   - </p>
59   - <ul class="menu_1">
60   - <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
61   - <li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.GRADE_NAME}${var.SUBJECT_NAME}
62   - <span>${var.CLASS_NAME}</span></p>
63   - </li>
64   - </c:forEach>
65   -
66   - </ul>
67   - </div>
  58 +
68 59 <div class="testpaper tab1">
69   - <p>试卷管理<span class="right jiao"></span></p>
  60 + <p>轻松考<span class="right jiao"></span></p>
70 61 <ul class="menu_1">
71 62 <li >
72   - <p id="qingsongkao_paper">轻松考试卷管理</p>
73   - <!-- <ul class="menu_2">
74   - <li><p>高一数学 202班</p></li>
75   - <li><p>高一数学 203班</p></li>
76   - </ul> -->
  63 + <p id="qingsongkao_paper">试卷管理</p>
77 64 </li>
78   - <li>
79   - <p id="jishice_paper">即时测试卷管理</p>
80   -
81   - <!-- <ul class="menu_2">
82   - <li><p>高一数学 202班</p></li>
83   - <li><p>高一数学 203班</p></li>
84   - </ul> -->
  65 + <li >
  66 + <p>测验分析</p>
  67 + <ul class="menu_2">
  68 + <c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
  69 + <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME}${var.CNAME} 成绩</p></li>
  70 + </c:forEach>
  71 + </ul>
85 72 </li>
86 73 </ul>
87 74  
88 75 </div>
89 76 <div class="analyse tab1">
90 77 <p>
91   - 测验分析<span class="right jiao"></span>
  78 + 即时测<span class="right jiao"></span>
92 79 </p>
93 80  
94 81 <ul class="menu_1">
95   - <li >
96   - <p>轻松考测验分析</p>
97   - <ul class="menu_2">
98   - <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
99   - <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
100   - </c:forEach>
101   - </ul>
  82 + <li>
  83 + <p id="jishice_paper">试卷管理</p>
102 84 </li>
  85 +
103 86 <li>
104   - <p>即时测测验分析</p>
  87 + <p>测验分析</p>
105 88 <ul class="menu_2">
106   - <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
107   - <li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
  89 + <c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
  90 + <li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME}${var.CNAME} 成绩</p></li>
108 91 </c:forEach>
109 92 </ul>
110 93 </li>
111 94 </ul>
  95 + </div>
  96 + <div class="analyse tab1">
  97 + <p>
  98 + 课后练<span class="right jiao"></span>
  99 + </p>
112 100  
113   - <%-- <ul class="menu_1">
114   - <c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
115   - <li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
116   - </c:forEach>
117   - </ul> --%>
  101 + <ul class="menu_1">
  102 + <li>
  103 + <p id="practice_do">布置练习</p>
  104 + </li>
  105 + <li>
  106 + <p id="practice_manage">练习管理</p>
  107 + </li>
  108 + <li>
  109 + <p id="practice_report">练习报表</p>
  110 + </li>
  111 + </ul>
118 112 </div>
119 113 </div>
120 114 <div class="content_r">
... ...
resources/mybatis1/api/V1Mapper.xml
  View file @8246d00
... ... @@ -135,32 +135,35 @@
135 135 </select>
136 136  
137 137 <!-- 通过教师ID获取科目数据 -->
  138 + <select id="getTeacherInfoGrade" parameterType="pd" resultType="pd">
  139 + SELECT
  140 + sv_coursemanagement.CLASS_ID,
  141 + sv_sclass.CLASS_NAME,
  142 + sv_coursemanagement.SUBJECT_ID,
  143 + sv_subject.CNAME
  144 + FROM
  145 + sv_coursemanagement
  146 + LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
  147 + LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID
  148 + LEFT JOIN sv_term on sv_coursemanagement.TERM_ID = sv_term.TERM_ID
  149 + WHERE sv_coursemanagement.TEACHER_ID = #{ID}
  150 + AND sv_term.START_DATE &lt; now()
  151 + AND sv_term.END_DATE &gt; now();
  152 +
  153 + </select>
  154 +
  155 + <!-- 通过教师ID获取教师信息 -->
138 156 <select id="getTeacherInfo" parameterType="pd" resultType="pd">
139 157 SELECT
140   - sv_teacher.`NAME` AS TEACHER_NAME,
141   - sv_grade.`NAME` AS GRADE_NAME,
142   - sv_grade.`ENAME` AS GRADE_ENAME,
143   - sv_grade.ID AS GRADE_ID,
144   - sv_sclass.CLASS_NAME AS CLASS_NAME,
145   - sv_sclass.ID AS CLASS_ID,
146   - sv_subject.CNAME AS SUBJECT_NAME,
147   - sv_subject.ENAME AS SUBJECT_ENAME,
148   - sv_subject.ID AS SUBJECT_ID,
149   - sv_school.`NAME` as SCHOOL_NAME,
150   - sv_school.ID AS SCHOOL_ID,
151   - term.TERM_ID
  158 + sv_teacher.`NAME` AS TNAME,
  159 + sv_school.`NAME` AS SNAME,
  160 + sv_teacher.SCHOOL_ID,
  161 + sv_teacher.ID AS ID
152 162 FROM
153   - sv_coursemanagement AS couse
154   - LEFT JOIN sv_term AS term ON couse.TERM_ID = term.TERM_ID
155   - LEFT JOIN sv_grade ON couse.GRADE_ID = sv_grade.ID
156   - LEFT JOIN sv_teacher ON sv_teacher.ID = couse.TEACHER_ID
157   - LEFT JOIN sv_sclass ON couse.CLASS_ID = sv_sclass.ID
158   - LEFT JOIN sv_subject ON couse.SUBJECT_ID = sv_subject.ID
  163 + sv_teacher
159 164 LEFT JOIN sv_school ON sv_teacher.SCHOOL_ID = sv_school.ID
160 165 WHERE
161   - TEACHER_ID = #{ID}
162   - AND term.START_DATE &lt; now()
163   - AND term.END_DATE &gt; now();
  166 + sv_teacher.ID = #{ID};
164 167  
165 168 </select>
166 169 <!-- 通过admin ID获取科目数据 -->
... ...
resources/mybatis1/sunvote/CourseManagementMapper.xml
  View file @8246d00
... ... @@ -17,6 +17,7 @@
17 17 REMARK,
18 18 GRADE_ID,
19 19 TERM_ID,
  20 + SCHOOL_ID,
20 21 ID
21 22 </sql>
22 23  
... ... @@ -30,6 +31,7 @@
30 31 #{REMARK},
31 32 #{GRADE_ID},
32 33 #{TERM_ID},
  34 + #{SCHOOL_ID},
33 35 #{ID}
34 36 </sql>
35 37  
... ... @@ -46,6 +48,7 @@
46 48 END_DATE,
47 49 GRADE_ID,
48 50 TERM_ID,
  51 + SCHOOL_ID,
49 52 REMARK
50 53 ) values (
51 54 #{ID},
... ... @@ -56,6 +59,7 @@
56 59 #{END_DATE},
57 60 #{GRADE_ID},
58 61 #{TERM_ID},
  62 + #{SCHOOL_ID},
59 63 #{REMARK}
60 64 )
61 65 </insert>
... ... @@ -81,6 +85,7 @@
81 85 REMARK = #{REMARK},
82 86 GRADE_ID = #{GRADE_ID},
83 87 TERM_ID = #{TERM_ID},
  88 + SCHOOL_ID = #{SCHOOL_ID},
84 89 ID = ID
85 90 where
86 91 ID = #{ID}
... ...
resources/mybatis1/sunvote/SubjectMapper.xml
  View file @8246d00
... ... @@ -100,7 +100,10 @@
100 100 <!-- 列表(全部) -->
101 101 <select id="listAllSchool" parameterType="pd" resultType="pd">
102 102 select
103   - <include refid="Field"></include>
  103 + CNAME,
  104 + ENAME,
  105 + REMARK,
  106 + ID
104 107 from
105 108 <include refid="tableName"></include>
106 109  
... ... @@ -118,7 +121,10 @@
118 121 <!-- 列表(全部) -->
119 122 <select id="listAllSchoollistPage" parameterType="pd" resultType="pd">
120 123 select
121   - <include refid="Field"></include>
  124 + CNAME,
  125 + ENAME,
  126 + REMARK,
  127 + sv_schoolgradesubject.SCHOOLGRADESUBJECT_ID AS ID
122 128 from
123 129 <include refid="tableName"></include>
124 130  
... ... @@ -151,6 +157,7 @@
151 157 <if test="GRADE_ID != null and GRADE_ID != ''">
152 158 and sv_schoolgradesubject.GRADE_ID = #{GRADE_ID}
153 159 </if>
  160 + and sv_schoolgradesubject.SUBJECT_ID != ''
154 161 )
155 162  
156 163 </select>
... ...
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
  View file @8246d00
... ... @@ -69,7 +69,6 @@ public class CourseManagementController extends BaseController {
69 69 @RequestMapping(value="/save")
70 70 public ModelAndView save() throws Exception{
71 71 logBefore(logger, Jurisdiction.getUsername()+"新增CourseManagement");
72   - if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
73 72 ModelAndView mv = this.getModelAndView();
74 73 PageData pd = new PageData();
75 74 pd = this.getPageData();
... ... @@ -79,6 +78,22 @@ public class CourseManagementController extends BaseController {
79 78 mv.setViewName("save_result");
80 79 return mv;
81 80 }
  81 + /**保存
  82 + * @param
  83 + * @throws Exception
  84 + */
  85 + @RequestMapping(value="/save2")
  86 + public ModelAndView save2() throws Exception{
  87 + logBefore(logger, Jurisdiction.getUsername()+"新增CourseManagement");
  88 + ModelAndView mv = this.getModelAndView();
  89 + PageData pd = new PageData();
  90 + pd = this.getPageData();
  91 + pd.put("ID", this.get32UUID());
  92 + coursemanagementService.save(pd);
  93 + mv.addObject("msg","success");
  94 + mv.setViewName("save_result2");
  95 + return mv;
  96 + }
82 97  
83 98 /**删除
84 99 * @param out
... ... @@ -203,6 +218,7 @@ public class CourseManagementController extends BaseController {
203 218 mv.addObject("pd", pd);
204 219 return mv;
205 220 }
  221 +
206 222 /**去新增页面
207 223 * @param
208 224 * @throws Exception
... ... @@ -226,7 +242,7 @@ public class CourseManagementController extends BaseController {
226 242 mv.addObject("terms", terms);
227 243 List<PageData> grades = gradeService.listAllInschool(pd);
228 244 mv.addObject("grades", grades);
229   - mv.addObject("msg", "save");
  245 + mv.addObject("msg", "save2");
230 246 mv.addObject("pd", pd);
231 247 return mv;
232 248 }
... ...
src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java
  View file @8246d00
... ... @@ -184,7 +184,6 @@ public class SchoolGradeSubjectController extends BaseController {
184 184 @ResponseBody
185 185 public Object deleteAll() throws Exception{
186 186 logBefore(logger, Jurisdiction.getUsername()+"批量删除SchoolGradeSubject");
187   - if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
188 187 PageData pd = new PageData();
189 188 Map<String,Object> map = new HashMap<String,Object>();
190 189 pd = this.getPageData();
... ...
src/com/fh/controller/sunvote/teacher/TeacherController.java
  View file @8246d00
... ... @@ -97,6 +97,43 @@ public class TeacherController extends BaseController {
97 97 mv.setViewName("save_result");
98 98 return mv;
99 99 }
  100 +
  101 + /**
  102 + * 保存
  103 + *
  104 + * @param
  105 + * @throws Exception
  106 + */
  107 + @RequestMapping(value = "/save2")
  108 + public ModelAndView save2() throws Exception {
  109 + ModelAndView mv = this.getModelAndView();
  110 + PageData pd = new PageData();
  111 + pd = this.getPageData();
  112 + pd.put("ID", this.get32UUID());
  113 + teacherService.save(pd);
  114 +
  115 + pd.put("USER_ID", pd.getString("ID")); // ID 主键
  116 + pd.put("LAST_LOGIN", ""); // 最后登录时间
  117 + pd.put("IP", ""); // IP
  118 + pd.put("STATUS", "0"); // 状态
  119 + pd.put("SKIN", "default");
  120 + pd.put("RIGHTS", "");
  121 + pd.put("USERNAME", pd.getString("ACCOUT"));
  122 + pd.put("ROLE_ID", "57bb1e6f138247a0b05cc721a5da1b64");
  123 + pd.put("PASSWORD",
  124 + new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
  125 + .getString("PASSWORD")).toString()); // 密码加密
  126 +
  127 + if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
  128 + userService.saveU(pd); // 执行保存
  129 + FHLOG.save(Jurisdiction.getUsername(),
  130 + "新增系统用户：" + pd.getString("USERNAME"));
  131 + }
  132 +
  133 + mv.addObject("msg", "success");
  134 + mv.setViewName("save_result2");
  135 + return mv;
  136 + }
100 137  
101 138 /**
102 139 * 删除
... ... @@ -135,23 +172,31 @@ public class TeacherController extends BaseController {
135 172 PageData pd = new PageData();
136 173 pd = this.getPageData();
137 174 teacherService.edit(pd);
138   -
139   - /*
140   - * pd.put("USER_ID", pd.getString("ID")); //ID 主键 pd.put("LAST_LOGIN",
141   - * ""); //最后登录时间 pd.put("IP", ""); //IP pd.put("STATUS", "0"); //状态
142   - * pd.put("SKIN", "default"); pd.put("RIGHTS", ""); pd.put("USERNAME",
143   - * pd.getString("ACCOUT")); pd.put("ROLE_ID",
144   - * "57bb1e6f138247a0b05cc721a5da1b64"); pd.put("PASSWORD", new
145   - * SimpleHash("SHA-1", pd.getString("ACCOUT"),
146   - * pd.getString("PASSWORD")).toString()); //密码加密
147   - *
148   - * userService.saveU(pd);
149   - */
150   -
151 175 mv.addObject("msg", "success");
152 176 mv.setViewName("save_result");
153 177 return mv;
154 178 }
  179 +
  180 + /**
  181 + * 修改
  182 + *
  183 + * @param
  184 + * @throws Exception
  185 + */
  186 + @RequestMapping(value = "/edit2")
  187 + public ModelAndView edit2() throws Exception {
  188 + logBefore(logger, Jurisdiction.getUsername() + "修改Teacher");
  189 + if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
  190 + return null;
  191 + } // 校验权限
  192 + ModelAndView mv = this.getModelAndView();
  193 + PageData pd = new PageData();
  194 + pd = this.getPageData();
  195 + teacherService.edit(pd);
  196 + mv.addObject("msg", "success");
  197 + mv.setViewName("save_result2");
  198 + return mv;
  199 + }
155 200  
156 201 /**
157 202 * 列表
... ... @@ -470,6 +515,21 @@ public class TeacherController extends BaseController {
470 515 mv.addObject("pd", pd);
471 516 return mv;
472 517 }
  518 +
  519 + @RequestMapping(value = "/goAdd2")
  520 + public ModelAndView goAdd2() throws Exception {
  521 + ModelAndView mv = this.getModelAndView();
  522 + PageData pd = new PageData();
  523 + pd = this.getPageData();
  524 + mv.setViewName("sunvote/teacher/teacher_edit2");
  525 +
  526 + List<PageData> schools = schoolService.listAll(pd);
  527 + mv.addObject("schools", schools);
  528 +
  529 + mv.addObject("msg", "save2");
  530 + mv.addObject("pd", pd);
  531 + return mv;
  532 + }
473 533  
474 534 /**
475 535 * 去修改页面
... ... @@ -506,7 +566,7 @@ public class TeacherController extends BaseController {
506 566 mv.setViewName("sunvote/teacher/teacher_edit2");
507 567 List<PageData> schools = schoolService.listAll(pd);
508 568 mv.addObject("schools", schools);
509   - mv.addObject("msg", "edit");
  569 + mv.addObject("msg", "edit2");
510 570 mv.addObject("pd", pd);
511 571 return mv;
512 572 }
... ...
src/com/fh/controller/system/login/LoginController.java
  View file @8246d00
... ... @@ -250,33 +250,10 @@ public class LoginController extends BaseController {
250 250 if ("teacher".equals(changeMenu)) {
251 251 PageData tpd = new PageData();
252 252 tpd.put("ID", user.getUSER_ID());
253   - List<PageData> teacherInfos = v1Service.getTeacherInfo(tpd);
254   - pd.put("TEACHER", teacherInfos);
255   - if (teacherInfos != null && teacherInfos.size() > 0) {
256   - PageData sData = teacherInfos.get(0);
257   - session.setAttribute(USERNAME + Const.SCHOOL_ID,
258   - sData.get("SCHOOL_ID"));
259   - session.setAttribute(USERNAME + Const.SCHOOL_NAME,
260   - sData.get("SCHOOL_NAME"));
261   - session.setAttribute(USERNAME + Const.GRADE_ID,
262   - sData.get("GRADE_ID"));
263   - session.setAttribute(USERNAME + Const.GRADE_NAME,
264   - sData.get("GRADE_NAME"));
265   - session.setAttribute(USERNAME + Const.CLASS_ID,
266   - sData.get("CLASS_ID"));
267   - session.setAttribute(USERNAME + Const.CLASS_NAME,
268   - sData.get("CLASS_NAME"));
269   - session.setAttribute(USERNAME + Const.SUBJECT_ID,
270   - sData.get("SUBJECT_ID"));
271   - session.setAttribute(USERNAME + Const.SUBJECT_NAME,
272   - sData.get("SUBJECT_NAME"));
273   - session.setAttribute(USERNAME + Const.TERM_ID,
274   - sData.get("TERM_ID"));
275   -
276   - sData.put("USER_ID", user.getUSER_ID());
277   - List<PageData> templateInfos = pagetemplateService.listAll(sData);
278   - mv.addObject("templateInfos", templateInfos);
279   - }
  253 + PageData teacherInfo = v1Service.getTeacherInfo(tpd);
  254 + List<PageData> classInfos = v1Service.getTeacherInfoGrade(tpd);
  255 + pd.put("TEACHER", teacherInfo);
  256 + pd.put("CLASSINFO", classInfos);
280 257 session.setAttribute(USERNAME + Const.ROLE_ID,
281 258 "teacher");
282 259 session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
... ...
src/com/fh/service/api/V1Manager.java
  View file @8246d00
... ... @@ -16,7 +16,9 @@ public interface V1Manager {
16 16  
17 17 public List<PageData> getQuestionsByPID(PageData pd) throws Exception;
18 18  
19   - public List<PageData> getTeacherInfo(PageData pd) throws Exception;
  19 + public List<PageData> getTeacherInfoGrade(PageData pd) throws Exception;
  20 +
  21 + public PageData getTeacherInfo(PageData pd) throws Exception;
20 22  
21 23 public List<PageData> getQuestionWrongInfo(PageData pd) throws Exception ;
22 24  
... ...
src/com/fh/service/api/impl/V1Service.java
  View file @8246d00
... ... @@ -42,8 +42,13 @@ public class V1Service implements V1Manager {
42 42 }
43 43  
44 44 @Override
45   - public List<PageData> getTeacherInfo(PageData pd) throws Exception {
46   - return (List<PageData>)dao.findForList("V1Mapper.getTeacherInfo", pd);
  45 + public List<PageData> getTeacherInfoGrade(PageData pd) throws Exception {
  46 + return (List<PageData>)dao.findForList("V1Mapper.getTeacherInfoGrade", pd);
  47 + }
  48 +
  49 + @Override
  50 + public PageData getTeacherInfo(PageData pd) throws Exception {
  51 + return (PageData)dao.findForObject("V1Mapper.getTeacherInfo", pd);
47 52 }
48 53  
49 54 @Override
... ...