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

jack
2 parents 66d02d57 a2414076
Showing 10 changed files with 69 additions and 8 deletions
WebRoot/WEB-INF/jsp/save_result2.jsp
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_edit2.jsp
resources/mybatis1/sunvote/SClassMapper.xml
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/controller/sunvote/sclass/SClassController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/service/sunvote/sclass/SClassManager.java
src/com/fh/service/sunvote/sclass/impl/SClassService.java
@@ -18,14 +18,14 @@
 </head>
 <body>
-	<div id="zhongxin"></div>
+	<div id="zhongxin">${msg}</div>
 	<script type="text/javascript">
 		var msg = "${msg}";
 		if(msg=="success" || msg==""){
 			document.getElementById('zhongxin').style.display = 'none';
 			window.top.modal.remove();
 		}else{
-			window.top.modal.remove();
+		//	window.top.modal.remove();
 		}
 	</script>
 </body>
@@ -26,6 +26,7 @@
 <body class="no-skin">
 	<form action="homework/list.do" method="post" name="Form" id="Form">
 		<input type="hidden" name="TEACHER_ID" id="TEACHER_ID" value="${pd.TEACHER_ID}"/>
+		<input type="hidden" name="SCHOOL_ID" id="SCHOOL_ID" value="${pd.SCHOOL_ID}"/>
 		<div class="head_box">
 		<div class="box_header">
 			<div class="head_box_l">
@@ -53,7 +53,7 @@
 							</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>
+								<td><input type="text" name="ACCOUT" id="ACCOUT" value="${pd.ACCOUT}" <c:if test="${not empty pd.ACCOUT}">disabled="disabled" </c:if>  maxlength="255" placeholder="这里输入账号" title="账号" style="width:98%;"/></td>
 							</tr>
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">密码:</td>
@@ -182,6 +182,17 @@
 				$("#ACCOUT").focus();
 			return false;
 			}
+			var uPattern = /^[a-zA-Z][a-zA-Z0-9_-]{2,14}$/;
+			if(!uPattern.test($("#ACCOUT").val())){
+				$("#ACCOUT").tips({
+					side:3,
+		            msg:'账号不合法',
+		            bg:'#AE81FF',
+		            time:2
+		        });
+				$("#ACCOUT").focus();
+			return false;
+			}
 			if($("#PASSWORD").val()==""){
 				$("#PASSWORD").tips({
 					side:3,
@@ -90,6 +90,18 @@
 		where 
 			ID = #{ID}
 	</select>
+	<!-- 通过ID获取数据 -->
+	<select id="findByName" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			CLASS_NAME = #{CLASS_NAME}
+			<if test="SCHOOL_ID != null and SCHOOL_ID != ''">
+				and	SCHOOL_ID = #{SCHOOL_ID}
+			</if>
+	</select>
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
@@ -2851,6 +2851,9 @@ public class V1 extends BaseController {
 	public String listhomework() throws Exception {
 		ResponseGson<List<PageData>> res = new ResponseGson<List<PageData>>();
 		PageData pageData = this.getPageData();
+		if(pageData.get("COMPLETE_DATE") == null){
+			pageData.put("COMPLETE_DATE", pageData.get("COMPLETE"));
+		}
 		List<PageData> list = homeworkService.qlistAll(pageData);
 		res.setData(list);
 		return res.toJson();
@@ -348,7 +348,7 @@ public class HomeworkController extends BaseController {
 				int sc = 0 ;
 				int ac = 0 ;
 				for (PageData dpd : dataList) {
-					if (dpd.get("STUDENT_ID").equals(stuPd.get("ID"))) {
+					if (stuPd.get("ID") != null && dpd.get("STUDENT_ID") != null && dpd.get("STUDENT_ID").equals(stuPd.get("ID")) && isIn(dpd.getString("HOMEWORK_ID"),homeworkList)) {
 						stuPd.put(dpd.get("HOMEWORK_ID"),
 								dpd.get("STUDENT_SCORE"));
 						try {
@@ -422,6 +422,17 @@ public class HomeworkController extends BaseController {
 	}
+	private boolean isIn(String homeworkId,List<PageData> data){
+		if(data != null && homeworkId != null){
+			for(PageData pd : data){
+				if(homeworkId.equals(pd.get("HOMEWORK_ID"))){
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
 	/**
 	 * 去修改页面
 	 * 
@@ -87,8 +87,13 @@ public class SClassController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("ID", get32UUID());
-		sclassService.save(pd);
-		mv.addObject("msg","success");
+		List<PageData> list = sclassService.findByName(pd);
+		if(list == null || list.size() == 0){
+			sclassService.save(pd);
+			mv.addObject("msg","success");
+		}else{
+			mv.addObject("msg","班级名称已存在！");
+		}
 		mv.setViewName("save_result2");
 		return mv;
 	}
@@ -114,7 +114,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", ""); // 最后登录时间
@@ -129,12 +128,17 @@ public class TeacherController extends BaseController {
 						.getString("PASSWORD")).toString()); // 密码加密
 		if (null == userService.findByUsername(pd)) { // 判断用户名是否存在
+			teacherService.save(pd);
 			userService.saveU(pd); // 执行保存
+			mv.addObject("msg", "success");
 			FHLOG.save(Jurisdiction.getUsername(),
 					"新增系统用户：" + pd.getString("USERNAME"));
+		}else{
+			mv.addObject("msg", "用户名系统已存在。");
+			
 		}
-		mv.addObject("msg", "success");
+	
 		mv.setViewName("save_result2");
 		return mv;
 	}
@@ -48,6 +48,12 @@ public interface SClassManager{
 	 */
 	public PageData findById(PageData pd)throws Exception;
+	/**通过id获取数据
+	 * @param pd
+	 * @throws Exception
+	 */
+	public List<PageData> findByName(PageData pd)throws Exception;
+	
 	/**批量删除
 	 * @param ArrayDATA_IDS
 	 * @throws Exception
 package com.fh.service.sunvote.sclass.impl;
 import java.util.List;
+
 import javax.annotation.Resource;
+
 import org.springframework.stereotype.Service;
+
 import com.fh.dao.DaoSupport;
 import com.fh.entity.Page;
 import com.fh.util.PageData;
@@ -77,6 +80,11 @@ public class SClassService implements SClassManager{
 	public void deleteAll(String[] ArrayDATA_IDS)throws Exception{
 		dao.delete("SClassMapper.deleteAll", ArrayDATA_IDS);
 	}
+
+	@Override
+	public List<PageData> findByName(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("SClassMapper.findByName", pd);
+	}
 }