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

=
2 parents 3cc65186 fcd1fe57
Showing 7 changed files with 46 additions and 5 deletions
WebRoot/WEB-INF/jsp/sunvote/homework/homework_report.jsp
resources/mybatis1/sunvote/HomeworkMapper.xml
src/com/fh/controller/base/BaseController.java
src/com/fh/controller/sunvote/homework/HomeworkController.java
src/com/fh/controller/sunvote/teacher/TeacherController.java
src/com/fh/service/sunvote/homework/HomeworkManager.java
src/com/fh/service/sunvote/homework/impl/HomeworkService.java
@@ -156,6 +156,7 @@
 					</c:choose>
 				</tbody>
 			</table>
+			${pd }
 			<div id="scrollableTable"></div>
 		</form>
 	</div>
@@ -278,5 +278,19 @@
 		</foreach>
 	</delete>
+	
+	<select id="report" parameterType="pd" resultType="pd">
+	
+		SELECT
+				*
+		FROM
+			sv_homework
+		LEFT JOIN sv_homeworkreport ON sv_homework.HOMEWORK_ID = sv_homeworkreport.HOMEWORK_ID
+		WHERE
+			sv_homework.CLASS_ID = #{CLASS_ID}
+		ORDER BY sv_homework.COMPLETE_DATE,sv_homework.HOMEWORK_ID,sv_homeworkreport.STUDNET_NO
+	
+	</select>
+	
 	<!-- fh313596790qq(青苔) -->
 </mapper>
 \ No newline at end of file
@@ -98,7 +98,7 @@ public class BaseController {
 		return role;
 	}
-	public String geTeacherID(){
+	public String getTeacherID(){
 		Session session = Jurisdiction.getSession();
 		User user = (User)session.getAttribute(Const.SESSION_USER);
 		if(user != null){
@@ -25,6 +25,7 @@ import com.fh.bean.HomeworkQuestion;
 import com.fh.controller.api.ResponseGson;
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
+import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
 import com.fh.service.sunvote.homework.HomeworkManager;
 import com.fh.service.sunvote.homework.HomeworkReportManager;
 import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
@@ -49,6 +50,12 @@ public class HomeworkController extends BaseController {
 	@Resource(name = "homeworkproblemService")
 	private HomeworkProblemManager homeworkproblemService;
+	
+	@Resource(name="coursemanagementService")
+	private CourseManagementManager coursemanagementService;
+	
+	@Resource(name="homeworkReporService")
+	private HomeworkReportManager homeworkReporkService;
 	/**
 	 * 保存
@@ -193,7 +200,7 @@ public class HomeworkController extends BaseController {
 		pd = this.getPageData();
 		pd = homeworkService.findById(pd); // 根据ID读取
 		pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
-		pd.put("TEACHER_ID", geTeacherID());
+		pd.put("TEACHER_ID", getTeacherID());
 		mv.setViewName("sunvote/homework/homework_edit2");
 		mv.addObject("msg", "edit");
 		mv.addObject("operation", "edit");
@@ -214,7 +221,7 @@ public class HomeworkController extends BaseController {
 		pd = this.getPageData();
 		pd = homeworkService.findById(pd); // 根据ID读取
 		pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
-		pd.put("TEACHER_ID", geTeacherID());
+		pd.put("TEACHER_ID", getTeacherID());
 		mv.setViewName("sunvote/homework/homework_view");
 		mv.addObject("msg", "edit");
 		mv.addObject("operation", "view");
@@ -235,7 +242,16 @@ public class HomeworkController extends BaseController {
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
-	
+		pd.put("TEACHER_ID", getTeacherID());
+		List<PageData> list = coursemanagementService.listTeacherClass(pd);
+		for(PageData ptd : list){
+			ptd.put("CLASS_ID", pd.get("ID"));
+			ptd.put("TEACHER_ID", pd.get("TEACHER_ID"));
+			List<PageData> dataList = homeworkService.listAll(ptd);
+			ptd.put("DETAIL", dataList);
+		}
+		pd.put("CLASS", list);
+		
 		mv.setViewName("sunvote/homework/homework_report");
 		mv.addObject("pd", pd);
 		return mv;
@@ -663,7 +663,7 @@ public class TeacherController extends BaseController {
 	public Object info() throws Exception {
 		PageData pd = this.getPageData();
 		ResponseGson<PageData> res = new ResponseGson();
-		pd.put("ID", this.geTeacherID());
+		pd.put("ID", this.getTeacherID());
 		PageData pageData = teacherService.findById(pd);
 		if (pageData != null && pageData.getString("ID") != null) {
 			pageData.put("PASSWORD", "");// 返回参数中不返回密码
@@ -55,6 +55,11 @@ public interface HomeworkManager{
 	 * @param pd
 	 * @throws Exception
 	 */
+	public List<PageData> report(PageData pd)throws Exception;
+	/**列表(全部)
+	 * @param pd
+	 * @throws Exception
+	 */
 	public List<PageData> qlistAll(PageData pd)throws Exception;
 	/**通过id获取数据
@@ -110,6 +110,11 @@ public class HomeworkService implements HomeworkManager{
 	public List<PageData> findByCode(PageData pd) throws Exception {
 		return (List<PageData>)dao.findForList("HomeworkMapper.findByCode", pd);
 	}
+
+	@Override
+	public List<PageData> report(PageData pd) throws Exception {
+		return (List<PageData>)dao.findForList("HomeworkMapper.report", pd);
+	}
 }