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

jack
2 parents 1f1e41d5 f8824641
Showing 7 changed files with 30 additions and 15 deletions
WebRoot/WEB-INF/jsp/sunvote/teacher/en_teach_paper.jsp
WebRoot/static/js/en_teach_paper.js
resources/dbconfig.properties
resources/mybatis1/api/V1Mapper.xml
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/controller/system/login/LoginController.java
@@ -154,5 +154,5 @@
 				var view = "View" ;
   	</script>
-	<script src="../static/js/en_teach_paper.js?a=2"></script>
+	<script src="../static/js/en_teach_paper.js?a=0"></script>
 </html>
 \ No newline at end of file
@@ -12,7 +12,9 @@
 				type:"post",
 				success:function(data){
 					console.log(data);
-					subject_id=data.data.subjectList[0].SUBJECT_ID;
+					if(typeof(data.data.subjectList) != 'undefind' && data.data.subjectList.length > 0){
+						subject_id=data.data.subjectList[0].SUBJECT_ID;
+					}
 					user_id=data.data.ID;
 					if(data.data.classInfoList.length>0){
 #数据源 1
+#url:jdbc:mysql://47.107.98.47:3306/education2?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 url:jdbc:mysql://120.78.57.84:3306/edu?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://120.78.57.84:3306/education3?autoReconnect=true&failOverReadOnly=false&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
 #url:jdbc:mysql://192.168.0.3:3306/education?autoReconnect=true&useUnicode=true&characterEncoding=utf8&characterSetResults=utf8 
@@ -8,12 +8,9 @@
 			CLASS_ID,CLASS_NAME,CLASS_CODE
 		FROM
 			sv_coursemanagement
-		LEFT JOIN sv_term ON sv_term.TERM_ID = sv_coursemanagement.TERM_ID
 		LEFT JOIN sv_sclass ON sv_coursemanagement.CLASS_ID = sv_sclass.ID
 		WHERE
-			sv_term.START_DATE &lt; NOW()
-		AND sv_term.END_DATE &gt; NOW()
-		AND TEACHER_ID = #{TEACHER_ID}
+			TEACHER_ID = #{TEACHER_ID}
 	</select>
 	<!-- 通过教师ID获取科目数据 -->
@@ -22,12 +19,9 @@
 		SUBJECT_ID,CNAME,ENAME,sv_subject.REMARK
 		FROM
 			sv_coursemanagement
-		LEFT JOIN sv_term ON sv_term.TERM_ID = sv_coursemanagement.TERM_ID
 		LEFT JOIN sv_subject ON sv_coursemanagement.SUBJECT_ID = sv_subject.ID
 		WHERE
-			sv_term.START_DATE &lt; NOW()
-			AND sv_term.END_DATE &gt; NOW()
-			AND TEACHER_ID = #{TEACHER_ID}
+			TEACHER_ID = #{TEACHER_ID}
 			group by SUBJECT_ID
 	</select>
@@ -238,6 +238,12 @@ public class V1 extends BaseController {
 			eventService.save(eventPd);
 			PageData pageData = teacherService.getUserInfo(pd);
+			if(pageData == null){
+				pd.put("PASSWORD",
+						new SimpleHash("SHA-1", pd.getString("ACCOUT"), pd
+								.getString("PASSWORD")).toString());
+				pageData = teacherService.getUserInfo(pd);
+			}
 			PageData headerMaster = headmasterService.findByUsenameAndPassword(pd);
 			if (pageData != null && pageData.getString("ID") != null) {
 				pageData.put("PASSWORD", "");// 返回参数中不返回密码
@@ -26,7 +26,6 @@ import com.fh.entity.Page;
 import com.fh.service.api.V1Manager;
 import com.fh.service.sunvote.school.SchoolManager;
 import com.fh.service.sunvote.subject.SubjectManager;
-import com.fh.service.sunvote.subject.impl.SubjectService;
 import com.fh.service.sunvote.teacher.TeacherManager;
 import com.fh.service.system.fhlog.FHlogManager;
 import com.fh.service.system.user.UserManager;
@@ -61,6 +60,7 @@ public class TeacherController extends BaseController {
 	@Resource(name="subjectService")
 	private SubjectManager subjectService;
+	
 	/**
 	 * 保存
 	 * 
@@ -77,7 +77,6 @@ public class TeacherController extends BaseController {
 		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", ""); // 最后登录时间
@@ -92,6 +91,7 @@ public class TeacherController extends BaseController {
 						.getString("PASSWORD")).toString()); // 密码加密
 		if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
+			teacherService.save(pd);
 			userService.saveU(pd); // 执行保存
 			FHLOG.save(Jurisdiction.getUsername(),
 					"新增系统用户：" + pd.getString("USERNAME"));
@@ -342,7 +342,9 @@ public class TeacherController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("userId", userId);
-		pd.put("subject_id",  getSubjectID(userId));
+		pd.put("ID", getTeacherID());
+		PageData pageData = teacherService.findById(pd);
+		pd.put("subject_id",  pageData.get("SUBJECT_IDS"));
 		if(isChineseLanguageClient()){
 			mv.setViewName("sunvote/teacher/paper_view");
 		}else{
@@ -789,11 +791,17 @@ public class TeacherController extends BaseController {
 			// 在任课表中查找老师教哪些班级，然后查出班级信息
 			List<PageData> classInfoList = v1Service
 					.getTeacherClassInfo(pt);
+			pt.put("ID", pageData.get("SUBJECT_IDS"));
 			pageData.put("classInfoList", classInfoList);
 			// 在认可表中查找老师教哪些科目，然后查出科目信息
-			List<PageData> subjectList = v1Service
-					.getTeacherSubjectInfo(pt);
+			List<PageData> subjectList = new ArrayList<PageData>();
+			PageData tmpd = subjectService.findById(pt);
+			if(tmpd != null){
+				tmpd.put("SUBJECT_ID", tmpd.get("ID"));
+			}
+			subjectList.add(tmpd);
+//					v1Service.getTeacherSubjectInfo(pt);
 			// 一个sql语句完成。
 			pageData.put("subjectList", subjectList);
@@ -177,6 +177,10 @@ public class LoginController extends BaseController {
 					tpd.put("ACCOUT", pd.get("USERNAME"));
 					tpd.put("PASSWORD", PASSWORD);
 					PageData pageData = teacherService.getUserInfo(tpd);
+					if(pageData == null){
+						tpd.put("PASSWORD", passwd);
+						pageData = teacherService.getUserInfo(tpd);
+					}
 					if(pageData != null){
 						user.setTeacherID(pageData.getString("ID"));
 					}