修复bug

孙向锦
1 parent 837ae11d
Showing 13 changed files with 210 additions and 130 deletions
WebRoot/WEB-INF/jsp/sunvote/subject/subject_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_list2.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
resources/mybatis1/api/V1Mapper.xml
resources/mybatis1/sunvote/CourseManagementMapper.xml
resources/mybatis1/sunvote/SubjectMapper.xml
src/com/fh/controller/sunvote/coursemanagement/CourseManagementController.java
src/com/fh/controller/sunvote/schoolgradesubject/SchoolGradeSubjectController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/controller/system/login/LoginController.java
src/com/fh/service/api/V1Manager.java
src/com/fh/service/api/impl/V1Service.java
@@ -71,7 +71,7 @@
 										value="${var.ID}" />${vs.index+1}</td>
 									<td class='center'>${var.CNAME}</td>
 									<td class='center'>${var.ENAME}</td>
-									<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>
+									<td><a onclick="del('${var.ID}');"><img src="static/images/remove.png" /></a></td>
 								</tr>
@@ -134,11 +134,22 @@
 					  }
 					}
 					if(str==''){
-						
+						if(Id != ''){
+							$.ajax({
+								type: "POST",
+								url: '<%=basePath%>schoolgradesubject/deleteAll.do?tm='+new Date().getTime(),
+						    	data: {DATA_IDS:Id},
+								dataType:'json',
+								cache: false,
+								success: function(data){
+									tosearch();
+								}
+							});
+						}
 					}else{
 						$.ajax({
 								type: "POST",
-								url: '<%=basePath%>subject/deleteAll.do?tm='+new Date().getTime(),
+								url: '<%=basePath%>schoolgradesubject/deleteAll.do?tm='+new Date().getTime(),
 						    	data: {DATA_IDS:str},
 								dataType:'json',
 								//beforeSend: validateData,
@@ -32,20 +32,10 @@
 					<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}"/>
 						<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>
-								<select class="chosen-select form-control" name="SCHOOL_ID" id="SCHOOL_ID" data-placeholder="这里输入所属学校">
-									<c:forEach var="item" items="${schools}">
-										<option value="${item.ID}"  <c:if test="${pd.SCHOOL_ID==item.ID}">selected="true"</c:if>>${item.NAME}</option>
-									</c:forEach>
-								</select>
-								</td>
-								<%-- <input type="number" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}" maxlength="32" placeholder="这里输入所在学校" title="所在学校" style="width:98%;"/></td> --%>
-							</tr>
-							<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>
@@ -105,7 +105,7 @@
 					</table>
 					<div class="footer" style="width:auto">
 				<div class="creat">
-					<input type="button"  onclick="$('.title_time').modal('show');" value="添加老师" />
+					<input type="button"  onclick="add();" value="添加老师" />
 				</div>
 				<div class="removeAll">
 					<input type="button" onclick="deleteAll()" value="删除" />
@@ -209,7 +209,18 @@
 		function edit(Id){
 			window.top.modal.init({
 			'title':'修改信息',
-			'url':'<%=basePath%>teacher/goEdit2.do?ID='+Id,
+			'url':'<%=basePath%>teacher/goEdit2.do?school_id=${pd.SCHOOL_ID}&ID='+Id,
+			func:function() {
+				tosearch();
+			}
+			});
+			window.top.modal.show();
+		}
+		
+		function add(){
+			window.top.modal.init({
+			'title':'添加教师',
+			'url':'<%=basePath%>teacher/goAdd2.do?school_id=${pd.SCHOOL_ID}',
 			func:function() {
 				tosearch();
 			}
@@ -48,73 +48,67 @@
 				</div>
 				<div class="name">
 					<p>欢迎！</p>
-					<p id="name">${pd.TEACHER[0].TEACHER_NAME }</p>
-					<p id="school">${pd.TEACHER[0].SCHOOL_NAME }</p>
+					<p id="name">${pd.TEACHER.TNAME }</p>
+					<p id="school">${pd.TEACHER.SNAME }</p>
 				</div>
+					<br/>
+			<br/>
+			<br/>
 			</div>
-			<div class="class tab1">
-				<p>
-					班级管理<span class="right jiao"></span>
-				</p>
-				<ul class="menu_1">
-					<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-						<li onclick="event.stopPropagation();chooseClass('${var.CLASS_ID}','${var.TERM_ID}')"><p>${var.GRADE_NAME}${var.SUBJECT_NAME}
-								<span>${var.CLASS_NAME}</span></p>
-						</li>
-			</c:forEach>
-
-			</ul>
-		</div>
+			
 		<div class="testpaper tab1">
-			<p>试卷管理<span class="right jiao"></span></p>
+			<p>轻松考<span class="right jiao"></span></p>
 				<ul class="menu_1">
 					<li >
-						<p id="qingsongkao_paper">轻松考试卷管理</p>
-						<!-- <ul class="menu_2">
-							<li><p>高一数学 202班</p></li>
-							<li><p>高一数学 203班</p></li>
-						</ul> -->
+						<p id="qingsongkao_paper">试卷管理</p>
 					</li>
-					<li>
-						<p id="jishice_paper">即时测试卷管理</p>
-						
-						<!-- <ul class="menu_2">
-							<li><p>高一数学 202班</p></li>
-							<li><p>高一数学 203班</p></li>
-						</ul> -->
+					<li >
+						<p>测验分析</p>
+						<ul class="menu_2">
+						<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
+							<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME}${var.CNAME} 成绩</p></li>
+						</c:forEach>
+						</ul>
 					</li>
 				</ul>
 		</div>
 		<div class="analyse tab1">
 			<p>
-				测验分析<span class="right jiao"></span>
+				即时测<span class="right jiao"></span>
 			</p>
 			<ul class="menu_1">
-					<li >
-						<p>轻松考测验分析</p>
-						<ul class="menu_2">
-						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-							<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
-						</c:forEach>
-						</ul>
+					<li>
+						<p id="jishice_paper">试卷管理</p>
 					</li>
+					
 					<li>
-						<p>即时测测验分析</p>
+						<p>测验分析</p>
 						<ul class="menu_2">
-						<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-							<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
+						<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
+							<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME}${var.CNAME} 成绩</p></li>
 						</c:forEach>
 						</ul>
 					</li>
 				</ul>
+		</div>
+		<div class="analyse tab1">
+			<p>
+				课后练<span class="right jiao"></span>
+			</p>
-		<%-- 	<ul class="menu_1">
-			<c:forEach items="${pd.TEACHER}" var="var" varStatus="vs">
-				<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME} 成绩</p></li>
-			</c:forEach>
-			</ul> --%>
+			<ul class="menu_1">
+					<li>
+						<p id="practice_do">布置练习</p>
+					</li>
+					<li>
+						<p id="practice_manage">练习管理</p>
+					</li>
+					<li>
+						<p id="practice_report">练习报表</p>
+					</li>
+				</ul>
 		</div>
 	</div>
 	<div class="content_r">
@@ -135,32 +135,35 @@
 	</select>
 	<!-- 通过教师ID获取科目数据 -->
+	<select id="getTeacherInfoGrade" parameterType="pd" resultType="pd">
+		 	SELECT
+			  sv_coursemanagement.CLASS_ID,
+				sv_sclass.CLASS_NAME,
+				sv_coursemanagement.SUBJECT_ID,
+			  sv_subject.CNAME
+			FROM
+				sv_coursemanagement
+			LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
+			LEFT JOIN sv_subject on sv_coursemanagement.SUBJECT_ID = sv_subject.ID
+			LEFT JOIN sv_term on sv_coursemanagement.TERM_ID = sv_term.TERM_ID
+			WHERE sv_coursemanagement.TEACHER_ID =  #{ID} 
+					AND sv_term.START_DATE &lt; now() 
+					AND sv_term.END_DATE &gt; now();
+		
+	</select>
+	
+	<!-- 通过教师ID获取教师信息 -->
 	<select id="getTeacherInfo" parameterType="pd" resultType="pd">
 		 	SELECT
-				sv_teacher.`NAME` AS TEACHER_NAME,
-				sv_grade.`NAME` AS GRADE_NAME,
-				sv_grade.`ENAME` AS GRADE_ENAME,
-				sv_grade.ID AS GRADE_ID,
-				sv_sclass.CLASS_NAME AS CLASS_NAME,
-				sv_sclass.ID AS CLASS_ID,
-				sv_subject.CNAME AS SUBJECT_NAME,
-				sv_subject.ENAME AS SUBJECT_ENAME,
-				sv_subject.ID AS SUBJECT_ID,
-			  	sv_school.`NAME` as SCHOOL_NAME,
-			  	sv_school.ID AS SCHOOL_ID,
-			  	term.TERM_ID
+				sv_teacher.`NAME` AS TNAME,
+				sv_school.`NAME` AS SNAME,
+				sv_teacher.SCHOOL_ID,
+				sv_teacher.ID AS ID
 			FROM
-				sv_coursemanagement AS couse
-			LEFT JOIN sv_term AS term ON couse.TERM_ID = term.TERM_ID
-			LEFT JOIN sv_grade ON couse.GRADE_ID = sv_grade.ID
-			LEFT JOIN sv_teacher ON sv_teacher.ID = couse.TEACHER_ID
-			LEFT JOIN sv_sclass ON couse.CLASS_ID = sv_sclass.ID
-			LEFT JOIN sv_subject ON couse.SUBJECT_ID = sv_subject.ID
+				sv_teacher
 			LEFT JOIN sv_school ON sv_teacher.SCHOOL_ID = sv_school.ID
 			WHERE
-				TEACHER_ID = #{ID}
-			AND term.START_DATE &lt; now() 
-			AND term.END_DATE &gt; now();
+				sv_teacher.ID =  #{ID};
 	</select>
 	<!-- 通过admin ID获取科目数据 -->
@@ -17,6 +17,7 @@
 		REMARK,	
 		GRADE_ID,
 		TERM_ID,
+		SCHOOL_ID,
 		ID
 	</sql>
@@ -30,6 +31,7 @@
 		#{REMARK},	
 		#{GRADE_ID},	
 		#{TERM_ID},	
+		#{SCHOOL_ID},	
 		#{ID}
 	</sql>
@@ -46,6 +48,7 @@
 			END_DATE,	
 			GRADE_ID,
 			TERM_ID,
+			SCHOOL_ID,
 			REMARK
 		) values (
 		#{ID},	
@@ -56,6 +59,7 @@
 		#{END_DATE},	
 		#{GRADE_ID},	
 		#{TERM_ID},	
+		#{SCHOOL_ID},	
 		#{REMARK}
 		)
 	</insert>
@@ -81,6 +85,7 @@
 			REMARK = #{REMARK},
 			GRADE_ID = #{GRADE_ID},	
 			TERM_ID = #{TERM_ID},	
+			SCHOOL_ID = #{SCHOOL_ID},	
 		ID = ID
 		where 
 		ID = #{ID}
@@ -100,7 +100,10 @@
 	<!-- 列表(全部) -->
 	<select id="listAllSchool" parameterType="pd" resultType="pd">
 		select
-		<include refid="Field"></include>
+		CNAME,	
+		ENAME,	
+		REMARK,	
+		ID
 		from 
 		<include refid="tableName"></include>
@@ -118,7 +121,10 @@
 	<!-- 列表(全部) -->
 	<select id="listAllSchoollistPage" parameterType="pd" resultType="pd">
 		select
-		<include refid="Field"></include>
+		CNAME,	
+		ENAME,	
+		REMARK,	
+		sv_schoolgradesubject.SCHOOLGRADESUBJECT_ID AS ID
 		from 
 		<include refid="tableName"></include>
@@ -151,6 +157,7 @@
 			<if test="GRADE_ID != null and GRADE_ID != ''">
 				and	sv_schoolgradesubject.GRADE_ID = #{GRADE_ID}
 			</if>
+			and sv_schoolgradesubject.SUBJECT_ID != ''
 		)
 	</select>
@@ -69,7 +69,6 @@ public class CourseManagementController extends BaseController {
 	@RequestMapping(value="/save")
 	public ModelAndView save() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"新增CourseManagement");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -79,6 +78,22 @@ public class CourseManagementController extends BaseController {
 		mv.setViewName("save_result");
 		return mv;
 	}
+	/**保存
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value="/save2")
+	public ModelAndView save2() throws Exception{
+		logBefore(logger, Jurisdiction.getUsername()+"新增CourseManagement");
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("ID", this.get32UUID());
+		coursemanagementService.save(pd);
+		mv.addObject("msg","success");
+		mv.setViewName("save_result2");
+		return mv;
+	}
 	/**删除
 	 * @param out
@@ -203,6 +218,7 @@ public class CourseManagementController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}	
+
 	/**去新增页面
 	 * @param
 	 * @throws Exception
@@ -226,7 +242,7 @@ public class CourseManagementController extends BaseController {
 		mv.addObject("terms", terms);
 		List<PageData> grades =  gradeService.listAllInschool(pd);
 		mv.addObject("grades", grades);
-		mv.addObject("msg", "save");
+		mv.addObject("msg", "save2");
 		mv.addObject("pd", pd);
 		return mv;
 	}	
@@ -184,7 +184,6 @@ public class SchoolGradeSubjectController extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"批量删除SchoolGradeSubject");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
 		PageData pd = new PageData();		
 		Map<String,Object> map = new HashMap<String,Object>();
 		pd = this.getPageData();
@@ -97,6 +97,43 @@ public class TeacherController extends BaseController {
 		mv.setViewName("save_result");
 		return mv;
 	}
+	
+	/**
+	 * 保存
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/save2")
+	public ModelAndView save2() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("ID", this.get32UUID());
+		teacherService.save(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;
+	}
 	/**
 	 * 删除
@@ -135,23 +172,31 @@ 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()); //密码加密
-		 * 
-		 * userService.saveU(pd);
-		 */
-
 		mv.addObject("msg", "success");
 		mv.setViewName("save_result");
 		return mv;
 	}
+	
+	/**
+	 * 修改
+	 * 
+	 * @param
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/edit2")
+	public ModelAndView edit2() throws Exception {
+		logBefore(logger, Jurisdiction.getUsername() + "修改Teacher");
+		if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
+			return null;
+		} // 校验权限
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		teacherService.edit(pd);
+		mv.addObject("msg", "success");
+		mv.setViewName("save_result2");
+		return mv;
+	}
 	/**
 	 * 列表
@@ -470,6 +515,21 @@ public class TeacherController extends BaseController {
 		mv.addObject("pd", pd);
 		return mv;
 	}
+	
+	@RequestMapping(value = "/goAdd2")
+	public ModelAndView goAdd2() throws Exception {
+		ModelAndView mv = this.getModelAndView();
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		mv.setViewName("sunvote/teacher/teacher_edit2");
+		
+		List<PageData> schools = schoolService.listAll(pd);
+		mv.addObject("schools", schools);
+		
+		mv.addObject("msg", "save2");
+		mv.addObject("pd", pd);
+		return mv;
+	}
 	/**
 	 * 去修改页面
@@ -506,7 +566,7 @@ public class TeacherController extends BaseController {
 		mv.setViewName("sunvote/teacher/teacher_edit2");
 		List<PageData> schools = schoolService.listAll(pd);
 		mv.addObject("schools", schools);
-		mv.addObject("msg", "edit");
+		mv.addObject("msg", "edit2");
 		mv.addObject("pd", pd);
 		return mv;
 	}
@@ -250,33 +250,10 @@ public class LoginController extends BaseController {
 				if ("teacher".equals(changeMenu)) {
 					PageData tpd = new PageData();
 					tpd.put("ID", user.getUSER_ID());
-					List<PageData> teacherInfos = v1Service.getTeacherInfo(tpd);
-					pd.put("TEACHER", teacherInfos);
-					if (teacherInfos != null && teacherInfos.size() > 0) {
-						PageData sData = teacherInfos.get(0); 
-						session.setAttribute(USERNAME + Const.SCHOOL_ID,
-								sData.get("SCHOOL_ID"));
-						session.setAttribute(USERNAME + Const.SCHOOL_NAME,
-								sData.get("SCHOOL_NAME"));
-						session.setAttribute(USERNAME + Const.GRADE_ID,
-								sData.get("GRADE_ID"));
-						session.setAttribute(USERNAME + Const.GRADE_NAME,
-								sData.get("GRADE_NAME"));
-						session.setAttribute(USERNAME + Const.CLASS_ID,
-								sData.get("CLASS_ID"));
-						session.setAttribute(USERNAME + Const.CLASS_NAME,
-								sData.get("CLASS_NAME"));
-						session.setAttribute(USERNAME + Const.SUBJECT_ID,
-								sData.get("SUBJECT_ID"));
-						session.setAttribute(USERNAME + Const.SUBJECT_NAME,
-								sData.get("SUBJECT_NAME"));
-						session.setAttribute(USERNAME + Const.TERM_ID,
-								sData.get("TERM_ID"));
-						
-						sData.put("USER_ID", user.getUSER_ID());
-						List<PageData> templateInfos = pagetemplateService.listAll(sData);
-						mv.addObject("templateInfos", templateInfos);
-					}
+					PageData teacherInfo = v1Service.getTeacherInfo(tpd);
+					List<PageData> classInfos = v1Service.getTeacherInfoGrade(tpd);
+					pd.put("TEACHER", teacherInfo);
+					pd.put("CLASSINFO", classInfos);
 					session.setAttribute(USERNAME + Const.ROLE_ID,
 							"teacher");
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
@@ -16,7 +16,9 @@ public interface V1Manager {
 	public List<PageData> getQuestionsByPID(PageData pd) throws Exception;
-	public List<PageData> getTeacherInfo(PageData pd) throws Exception;
+	public List<PageData> getTeacherInfoGrade(PageData pd) throws Exception;
+	
+	public PageData getTeacherInfo(PageData pd) throws Exception;
 	public List<PageData> getQuestionWrongInfo(PageData pd) throws Exception ;
@@ -42,8 +42,13 @@ public class V1Service implements V1Manager {
 	}
 	@Override
-	public List<PageData> getTeacherInfo(PageData pd) throws Exception {
-		return (List<PageData>)dao.findForList("V1Mapper.getTeacherInfo", pd);
+	public List<PageData> getTeacherInfoGrade(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("V1Mapper.getTeacherInfoGrade", pd);
+	}
+	
+	@Override
+	public PageData getTeacherInfo(PageData pd) throws Exception {
+		return (PageData)dao.findForObject("V1Mapper.getTeacherInfo", pd);
 	}
 	@Override