修改报表数据

孙向锦
1 parent 7d79f4b6
Showing 6 changed files with 113 additions and 36 deletions
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_edit2.jsp
WebRoot/WEB-INF/jsp/sunvote/headmaster/headmaster_list2.jsp
WebRoot/WEB-INF/jsp/system/index/login.jsp
resources/mybatis1/sunvote/HomeworkMapper.xml
src/com/fh/controller/sunvote/headmaster/HeadmasterController.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -36,7 +36,7 @@
 							<tr>
 								<td style="width:75px;text-align: right;padding-top: 13px;">班级:</td>
 								<td>
-									<select class="chosen-select form-control" name="CLASS_ID" id="CLASS_ID" disabled="disabled" data-placeholder="这里输入所属学校">
+									<select class="chosen-select form-control" name="CLASS_ID" id="CLASS_ID" <c:if test="${msg eq 'edit'} "> disabled="disabled" </c:if> data-placeholder="这里输入所属学校">
 									<c:forEach var="item" items="${classes}">
 										<option value="${item.ID}"  <c:if test="${pd.CLASS_ID==item.ID}">selected="true"</c:if>>${item.CLASS_NAME}</option>
 									</c:forEach>
@@ -133,7 +133,7 @@
 		function edit(Id){
 			window.top.modal.init({
 			'title':'修改信息',
-			'url':'<%=basePath%>headmaster/goEdit.do?HEADMASTER_ID='+Id,
+			'url':'<%=basePath%>headmaster/goEdit2.do?HEADMASTER_ID='+Id,
 			func:function() {
 				tosearch();
 			}
@@ -63,8 +63,8 @@
 			<div class="form_box">
 				<form action="" method="post" name="loginbox" id="loginbox">
 					<input type="text" name="loginname" id="loginname" value=""
-						placeholder="用户名" /> <input type="password" name="password"
-						id="password" placeholder="密   码" value="" /> <a href="#"
+						placeholder="用户名" autocomplete = "off"/> <input type="password" name="password"
+						id="password" placeholder="密   码" value="" autocomplete = "off"/> <a href="#"
 						onclick="severCheck();" class="login_btn">登录</a>
 				</form>
  
@@ -221,12 +221,16 @@
 		<if test="TEACHER_ID != null and TEACHER_ID != ''"><!-- 关键词检索 -->
 			and TEACHER_ID = #{TEACHER_ID}
 		</if>
-		<if test="COMPLETE != null and COMPLETE != ''"><!-- 关键词检索 -->
-			and COMPLETE_DATE &gt; #{COMPLETE_DATE}
+		<if test="COMPLETE_DATE != null and COMPLETE_DATE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE = #{COMPLETE_DATE}
 		</if>
-		
-		and IS_DELETE is  null
-		
+		<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE &lt; #{START_DATE}
+		</if>
+		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
+			and COMPLETE_DATE &lt; #{END_DATE}
+		</if>
+		ORDER BY COMPLETE_DATE DESC
 	</select>
  
 	<!-- 列表(全部) -->
@@ -291,7 +295,14 @@
 			<if test="HOMEWORK_ID != null and HOMEWORK_ID != ''"><!-- 关键词检索 -->
 				and sv_homework.HOMEWORK_ID = #{HOMEWORK_ID}
 			</if>
-		ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
+			<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
+				and COMPLETE_DATE &lt; #{START_DATE}
+			</if>
+			<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
+				and COMPLETE_DATE &lt; #{END_DATE}
+			</if>
+			and sv_homework.COMPLETE_COUNT > 0
+			ORDER BY sv_homework.COMPLETE_DATE ,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
  
 	</select>
  
@@ -218,7 +218,8 @@ public class HeadmasterController extends BaseController {
 		PageData classPageData = headmasterService.findClassByHeaderId(pd);
 		pd.put("CLASS_ID", classPageData.get("ID"));
 		pd.put("CLASS_NAME", classPageData.get("CLASS_NAME"));
-		List<PageData> classes = headmasterService.listNoHeaderClass(pd);
+		List<PageData> classes = new ArrayList();
+		classes.add(classPageData);
 		mv.addObject("classes",classes);
 		mv.setViewName("sunvote/headmaster/headmaster_edit2");
 		mv.addObject("msg", "edit");
@@ -4,6 +4,7 @@ import java.io.PrintWriter;
 import java.text.DateFormat;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
+import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
@@ -234,6 +235,28 @@ public class HomeworkController extends BaseController {
 	}
  
  
+	public static String getWeekStart(int cur){
+		SimpleDateFormat format  = new SimpleDateFormat("YYYY-MM-dd");  
+		Calendar ca = Calendar.getInstance();  
+		ca.setFirstDayOfWeek(Calendar.MONDAY);  
+		int a = ca.getFirstDayOfWeek();
+		ca.set(Calendar.DAY_OF_WEEK, a); // Sunday  
+		ca.add(Calendar.DATE, cur * 7);
+		String weekEnd = format.format(ca.getTime());  
+		return weekEnd;
+	}
+	
+	public static String getWeekEnd(int cur){
+		SimpleDateFormat format  = new SimpleDateFormat("YYYY-MM-dd");  
+		Calendar ca = Calendar.getInstance();  
+		ca.setFirstDayOfWeek(Calendar.MONDAY);  
+		int a = ca.getFirstDayOfWeek();
+		ca.set(Calendar.DAY_OF_WEEK, a+6); // Sunday  
+		ca.add(Calendar.DATE, cur * 7);
+		String weekEnd = format.format(ca.getTime());  
+		return weekEnd + " 23:59:59";
+	}
+	
  
 	/**
 	 * 去修改页面
@@ -247,34 +270,76 @@ public class HomeworkController extends BaseController {
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		pd.put("TEACHER_ID", getTeacherID());
+		
+		
+		if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
+			pd.put("CURRENT_WEEK", "0");
+			String currentWeek = pd.getString("CURRENT_WEEK");
+			int current = Integer.parseInt(currentWeek);
+			pd.put("START_DATE", getWeekStart(current));
+			pd.put("END_DATE", getWeekEnd(current));
+		}else if(pd.get("CURRENT_WEEK") != null){
+			String currentWeek = pd.getString("CURRENT_WEEK");
+			int current = Integer.parseInt(currentWeek);
+			pd.put("START_DATE", getWeekStart(current));
+			pd.put("END_DATE", getWeekEnd(current));
+		}
+		
+		// 班级信息
 		List<PageData> list = coursemanagementService.listTeacherClass(pd);
-		for(PageData ptd : list){
-
-			ptd.put("CLASS_ID", ptd.get("ID"));
-			List<PageData> studentList = studentService.findByClassId(ptd);
-			int studentNum = 0 ;
-			if(studentList != null){
-				studentNum = studentList.size();
-			}
-			ptd.put("STUDENT_NUM", studentNum);
-			ptd.put("TEACHER_ID", pd.get("TEACHER_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");
+		for(PageData temp : list){
+			temp.remove("HEADMASTER_ID");
+			temp.remove("SCHOOL_ID");
+			temp.remove("GRADE_ID");
+			temp.remove("TEACHER_ID");
+			temp.remove("KEYBOARD_TYPE");
+			temp.remove("BASESTATION_ID");
+			temp.put("CLASS_ID", temp.get("ID"));
+			temp.remove("ID");
+		}
+		if(pd.get("CLASS_ID") == null && list.size() > 0){
+			pd.put("CLASS_ID", list.get(0).get("CLASS_ID"));
+		}
+		pd.put("CLASSES", list);
+		
+		// 对应班级数据
+		PageData data = new PageData();
+		List<PageData> studentList = studentService.findByClassId(pd);
+		
+		List<PageData> homeworkList = homeworkService.listAll(pd);
+		List<PageData> dataList = homeworkService.report(pd);
+		for(PageData stuPd:studentList){
+			for(PageData dpd : dataList){
+				if(dpd.get("STUDENT_ID").equals(stuPd.get("ID"))){
+					stuPd.put(dpd.get("HOMEWORK_ID"), dpd.get("GET_SCORE"));
+				}
 			}
-			ptd.put("HOMEWORKS", homeworkList);
+			stuPd.remove("SCHOOL_ID");
+			stuPd.remove("SEX");
+			stuPd.remove("CLASS_ID");
+			stuPd.remove("NUMBER");
+			stuPd.remove("ID");
+		}
+		for(PageData hpd: homeworkList){
+			hpd.remove("QUESTION_COUNT");
+			hpd.remove("COMPLETE_COUNT");
+			hpd.remove("SUBJECT_ID");
+			hpd.remove("SCHOOL_ID");
+			hpd.remove("GRADE_ID");
+			hpd.remove("SUMBIT_DATE");
+			hpd.remove("MODIFY_DATE");
+			hpd.remove("TEACHER_ID");
+			hpd.remove("CREATE_DATE");
+			hpd.remove("CLASS_ID");
+			hpd.remove("CODE");
+			hpd.remove("GET_MAX_SCORE");
+			hpd.remove("HOMEWORK_DESC");
+			hpd.remove("COMPLETE_DESC");
 		}
-		pd.put("CLASS", list);
-		pd.remove("JSON");
-		pd.remove("JSON");
-		pd.remove("ID");
+		data.put("HOMEWORKS", homeworkList);// 
+		data.put("STUDENTS", studentList);
+		
+		pd.put("DATA", data);
 		mv.setViewName("sunvote/homework/homework_report");
 		mv.addObject("pd", pd);
 		return mv;