修改接口

孙向锦
2 parents 00af725f 1aab9692
Showing 5 changed files with 46 additions and 18 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
resources/mybatis1/sunvote/HomeworkMapper.xml
src/com/fh/controller/api/V1.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -19,17 +19,30 @@
 <!-- 下拉框 -->
 <link rel="stylesheet" href="static/ace/css/chosen.css" />
   <link type="text/css" href="static/css/tablescroller.css" rel="stylesheet" />
-<!-- jsp文件头和头部 -->
-<%@ include file="../../system/index/top.jsp"%>
+
+<link
+	href="https://cdn.bootcss.com/bootstrap/3.3.7/css/bootstrap.min.css"
+	rel="stylesheet">
 <!-- 日期框 -->
 <link rel="stylesheet" href="static/ace/css/datepicker.css" />
 <style>
 	.font span{    font-size: 12px;
     font-weight: initial;color:#000;}
+    .search_btn{width:30px;}
+    .btn{margin:0 5px;}
 	</style>
 </head>
 <body style="background:#fff;">
+	<div style="padding-top:3%;">
+		<ul>
+			<c:forEach items="${pd.CLASS}" var="var" varStatus="vs">
+				<li class="btn btn-primary btn-lg">${var.CLASS_NAME}</li>
+			</c:forEach>
+				
+		</ul>
+	</div>
+	<hr />
 	<div style="padding:20px 20px;">
 		<form action="report/report.do" method="post" name="Form" id="Form" style="margin-bottom:0;">
 			<input type="hidden" name="CLASSID" id="CLASSID" value="${info.CLASS_ID}" />
@@ -41,6 +54,8 @@
 					<td><div style="width:150px;text-align:center;"><span>学生人数: ${info.STUDENT_NUM}</span></div></td>
 					<td></td>
+					
+				
 					<c:if test="${not empty subjectInfos}">
 						<td>
 							<select class="chosen-select form-control" name="SUBJECT_ID" id="SUBJECT_ID" data-placeholder="这里输入所属学校">
@@ -63,13 +78,15 @@
 						type="text" data-date-format="yyyy-mm-dd" readonly="readonly"
 						style="width:88px;" placeholder="结束日期" title="结束日期" /></td>
 					<td style="vertical-align:top;padding-left:2px"><a
-						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><i
-							id="nav-search-icon"
-							class="ace-icon fa fa-search bigger-110 nav-search-icon blue"></i></a></td>
+						class="btn btn-light btn-xs" onclick="tosearch();" title="检索"><img src="static/images/search.png" alt="" class="search_btn" /></a></td>
+					<td><li class="btn btn-default btn-sm">上一周</li></td>
+					<td><li class="btn btn-primary btn-sm">本一周</li></td>
+					<td><li class="btn btn-default btn-sm">下一周</li></td>
 				</tr>
 			</table>
+			<hr />
 			<table id="simple-table"
-				class="table table-striped table-bordered table-hover"
+				class="table table-bordered table-hover"
 				style="margin-top:0px;margin-bottom:0px;">
 				<thead>
 					<tr>
@@ -100,13 +100,13 @@
 			<ul class="menu_1">
 					<li>
-						<p id="practice_manage" onclick="event.stopPropagation();homeWorkList('${SCHOOL_ID}')">练习列表</p>
+						<p id="practice_manage" onclick="event.stopPropagation();homeWorkList('${pd.TEACHER.SCHOOL_ID}')">练习列表</p>
 					</li>
 					<li>
-						<p id="practice_do" onclick="event.stopPropagation();homeWork('${SCHOOL_ID}')">布置练习</p>
+						<p id="practice_do" onclick="event.stopPropagation();homeWork('${pd.TEACHER.SCHOOL_ID}')">布置练习</p>
 					</li>
 					<li>
-						<p id="practice_report" onclick="event.stopPropagation();homeReport('${SCHOOL_ID}')">练习报表</p>
+						<p id="practice_report" onclick="event.stopPropagation();homeReport('${pd.TEACHER.SCHOOL_ID}')">练习报表</p>
 					</li>
 				</ul>
 		</div>
@@ -160,6 +160,8 @@
 	    </div><!-- /.modal-content -->
 	  </div><!-- /.modal-dialog -->
 	</div><!-- /.modal -->
+	
+	
 	<script src="https://cdn.bootcss.com/jquery/1.12.4/jquery.min.js"></script>
 	<script
 		src="https://cdn.bootcss.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>
@@ -194,7 +196,7 @@
 		}
 		function homeReport(schoolId){
-			var path = '<%=basePath%>homework/report.do?teacher_id=${pd.TEACHER.ID}&ID=' + schoolId ;
+			var path = '<%=basePath%>homework/report.do?teacher_id=${pd.TEACHER.ID}&ID='+schoolId;
 			$("#mainFrame").attr('src',path);
 			window.top.loading.show();
@@ -288,6 +288,9 @@
 		LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
 		WHERE
 			sv_homework.CLASS_ID = #{CLASS_ID} and sv_homework.COMPLETE_COUNT > 0
+			<if test="HOMEWORK_ID != null and HOMEWORK_ID != ''"><!-- 关键词检索 -->
+				and HOMEWORK_ID = #{HOMEWORK_ID}
+			</if>
 		ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
 	</select>
@@ -2895,6 +2895,7 @@ public class V1 extends BaseController {
 			homePd.put("GET_SCORE_PERSENT", resultHomework.getGET_SCORE_PERSENT());
 			homePd.put("COMPLETE_DESC", resultHomework.getCOMPLETE_DESC());
 			homePd.put("GET_MAX_SCORE", resultHomework.getGET_MAX_SCORE());
+			homePd.put("COMPLETE_COUNT", "1");
 			homeworkService.edit(homePd);
 			List<PageData> list = homeworkReporkService.findByHomeworkID(homePd);
 			if(list == null || list.size() == 0){
@@ -2903,6 +2904,7 @@ public class V1 extends BaseController {
 				List<PageData> student = studentService.findByClassId(homePd);
 				for(PageData ptd : student){
 					ptd.put("STUDENT_NAME", ptd.get("NAME"));
+					ptd.put("HOMEWORK_REPORT_ID", this.get32UUID());
 					ptd.put("STUDENT_NO", ptd.get("SNO"));
 					ptd.put("RANK", student.size() + "");
 					ptd.put("KEYBOARD", ptd.get("KEYPAD_ID"));
@@ -247,14 +247,18 @@ public class HomeworkController extends BaseController {
 		for(PageData ptd : list){
 			ptd.put("CLASS_ID", ptd.get("ID"));
 			ptd.put("TEACHER_ID", pd.get("TEACHER_ID"));
-			List<PageData> dataList = homeworkService.report(ptd);
-			ptd.put("DETAIL", dataList);
-			ptd.remove("TEACHER_ID");
-			ptd.remove("CLASS_TYPE");
-			ptd.remove("BASESTATION_ID");
-			ptd.remove("SCHOOL_ID");
-			ptd.remove("GRADE_ID");
-			ptd.remove("ID");
+			List<PageData> homeworkList = homeworkService.listAll(ptd);
+			for(PageData hpd:homeworkList){
+				List<PageData> dataList = homeworkService.report(hpd);
+				hpd.put("STUDENTS", dataList);
+				hpd.remove("TEACHER_ID");
+				hpd.remove("CLASS_TYPE");
+				hpd.remove("BASESTATION_ID");
+				hpd.remove("SCHOOL_ID");
+				hpd.remove("GRADE_ID");
+				hpd.remove("ID");
+			}
+			ptd.put("HOMEWORKS", homeworkList);
 		}
 		pd.put("CLASS", list);
 		pd.remove("JSON");