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

=
2 parents 725e1c03 bf0c69bb
Showing 4 changed files with 78 additions and 33 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_list.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
resources/mybatis1/sunvote/HomeworkMapper.xml
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -48,16 +48,20 @@
 				<table class="table table-striped">
 				<col style="width: 10%" />
 				<col style="width: 20%" />
-				<col style="width: 20%" />
-				<col style="width: 20%" />
-				<col style="width: 20%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<thead>
 					<tr>
 						<th><input type="checkbox"  name='ids' id="ids" />序号</th>
-						<th>测验标题</th>
-						<th>创建时间</th>
-						<th>建议考试时长</th>
+						<th>练习标题</th>
+						<th>布置时间</th>
+						<th>完成时间</th>
+						<th>题目数</th>
+						<th>完成情况</th>
 						<th>总分</th>
 						<th>操作</th>
 					</tr>
@@ -69,23 +73,27 @@
 			<table class="table table-striped">
 				<col style="width: 10%" />
 				<col style="width: 20%" />
-				<col style="width: 20%" />
-				<col style="width: 20%" />
-				<col style="width: 20%" />
+				<col style="width: 15%" />
+				<col style="width: 15%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
+				<col style="width: 10%" />
 				<col style="width: 10%" />
 				<tbody>
 				<c:choose>
 					<c:when test="${not empty varList}">
 						<c:forEach items="${varList}" var="var" varStatus="vs">
 							<tr>
-								<td><input type="checkbox" name='ids' id="ids" value="${var.PAPER_ID}"/>${vs.index+1}</td>
-								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.PAPER_ID}">${var.TITLE}</a></td>
+								<td><input type="checkbox" name='ids' id="ids" value="${var.HOMEWORK_ID}"/>${vs.index+1}</td>
+								<td ><a  target="_blank" href="<%=basePath%>paper/iteminfo.do?paper_id=${var.HOMEWORK_ID}">${var.NAME}</a></td>
 								<td >${var.CREATE_DATE}</td>
-								<td >${var.EXAM_TIME}</td>
-								<td >${var.SCORE}</td>
+								<td >${var.COMPLETE_DATE}</td>
+								<td >${var.QUESTIOM_COUNT}</td>
+								<td >${var.COMPLETE_COUNT == "0" ? "未完成":"已完成"}</td>
+								<td >${var.ALL_SCORE}</td>
 								<td>
-								<a onclick="del('${var.PAPER_ID}');"><img src="static/images/remove.png" /></a>
-								<a onclick="del('${var.PAPER_ID}');"><img src="static/images/eidtor.png" /></a>
+								<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/remove.png" /></a>
+								<a onclick="del('${var.HOMEWORK_ID}');"><img src="static/images/eidtor.png" /></a>
 								</td>
 							</tr>
@@ -179,7 +179,7 @@
 		function homeWork(schoolId){
 			//var path = "../school/goEdit2.do?ID=" + schoolId ;
-			var path = '<%=basePath%>homework/list.do?ID=' + schoolId ;
+			var path = '<%=basePath%>homework/list.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
 				$("#mainFrame").attr('src',path);
 				window.top.loading.show();
@@ -27,6 +27,7 @@
 		GET_SCORE,	
 		GET_SCORE_PERSENT,	
 		GET_MAX_SCORE,	
+		QUESTIOM_COUNT,	
 		HOMEWORK_ID
 	</sql>
@@ -50,6 +51,7 @@
 		#{GET_SCORE},	
 		#{GET_SCORE_PERSENT},	
 		#{GET_MAX_SCORE},	
+		#{QUESTIOM_COUNT},	
 		#{HOMEWORK_ID}
 	</sql>
@@ -113,6 +115,8 @@
 			GET_SCORE_PERSENT = #{GET_SCORE_PERSENT},
 			</if><if test="GET_MAX_SCORE != null and GET_MAX_SCORE != ''">
 			GET_MAX_SCORE = #{GET_MAX_SCORE},
+			</if><if test="QUESTIOM_COUNT != null and QUESTIOM_COUNT != ''">
+			QUESTIOM_COUNT = #{QUESTIOM_COUNT},
 			</if>
 		HOMEWORK_ID = HOMEWORK_ID
 		where 
@@ -136,15 +140,23 @@
 		from 
 		<include refid="tableName"></include>
 		where 1=1
-		<if test="pd.keywords!= null and pd.keywords != ''"><!-- 关键词检索 -->
-			and
-				(
-				<!--	根据需求自己加检索条件
-					字段1 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%')
-					 or 
-					字段2 LIKE CONCAT(CONCAT('%', #{pd.keywords}),'%') 
-				-->
-				)
+		<if test="pd.SUBJECT_ID != null and pd.SUBJECT_ID != ''"><!-- 关键词检索 -->
+			and SUBJECT_ID = #{pd.SUBJECT_ID}
+		</if>
+		<if test="pd.CLASS_ID != null and pd.CLASS_ID != ''"><!-- 关键词检索 -->
+			and CLASS_ID = #{pd.CLASS_ID}
+		</if>
+		<if test="pd.GRADE_ID != null and pd.GRADE_ID != ''"><!-- 关键词检索 -->
+			and GRADE_ID = #{pd.GRADE_ID}
+		</if>
+		<if test="pd.SCHOOL_ID != null and pd.SCHOOL_ID != ''"><!-- 关键词检索 -->
+			and SCHOOL_ID = #{pd.SCHOOL_ID}
+		</if>
+		<if test="pd.TEACHER_ID != null and pd.TEACHER_ID != ''"><!-- 关键词检索 -->
+			and TEACHER_ID = #{pd.TEACHER_ID}
+		</if>
+		<if test="pd.COMPLETE != null and pd.COMPLETE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE &gt; #{pd.COMPLETE_DATE}
 		</if>
 	</select>
@@ -19,6 +19,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
 import com.fh.service.sunvote.homework.HomeworkManager;
@@ -51,9 +52,6 @@ public class HomeworkController extends BaseController {
 	@RequestMapping(value = "/save")
 	public ModelAndView save() throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "新增Homework");
-		if (!Jurisdiction.buttonJurisdiction(menuUrl, "add")) {
-			return null;
-		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -89,9 +87,6 @@ public class HomeworkController extends BaseController {
 	@RequestMapping(value = "/edit")
 	public ModelAndView edit() throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "修改Homework");
-		if (!Jurisdiction.buttonJurisdiction(menuUrl, "edit")) {
-			return null;
-		} // 校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -110,8 +105,6 @@ public class HomeworkController extends BaseController {
 	@RequestMapping(value = "/list")
 	public ModelAndView list(Page page) throws Exception {
 		logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
-		// if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
-		// //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -285,4 +278,36 @@ public class HomeworkController extends BaseController {
 		Gson gson = new Gson();
 		return gson.toJson(pd);
 	}
+	
+	/**
+	 * 列表
+	 * 
+	 * @param page
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/listdata", produces = "application/json;charset=UTF-8")
+	@ResponseBody
+	public String listdata(Page page) throws Exception {
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		String keywords = pd.getString("keywords"); // 关键词检索条件
+		if (null != keywords && !"".equals(keywords)) {
+			pd.put("keywords", keywords.trim());
+		}
+		page.setPd(pd);
+		List<PageData> varList = homeworkService.list(page); // 列出Homework列表
+		Gson gson = new Gson();
+		return gson.toJson(varList);
+	}
+	
+	@RequestMapping(value = "/savedata")
+	public String savedata() throws Exception {
+		PageData pd = new PageData();
+		pd = this.getPageData();
+		pd.put("HOMEWORK_ID", this.get32UUID()); // 主键
+		homeworkService.save(pd);
+		ResponseGson<String> responseGson = new ResponseGson<String>();
+		responseGson.setData(pd.getString("HOMEWORK_ID"));
+		return responseGson.toJson();
+	}
 }