From f7e4dd612576665d346c5aacaf74b3a4051ceb21 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Thu, 27 Jun 2019 14:26:33 +0800
Subject: [PATCH] 根据客户UI的需求进行修改

---
 WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp                                               |   5 ++---
 resources/mybatis1/sunvote/HomeworkMapper.xml                                                      |   4 ++++
 resources/mybatis1/sunvote/HomeworkReportMapper.xml                                                |   9 +++++++++
 resources/mybatis1/sunvote/InstantQuestionDataSource1Mapper.xml                                    |   6 +++---
 src/com/fh/bean/ResultHomework.java                                                                |   7 +++++++
 src/com/fh/controller/api/V1.java                                                                  |   1 +
 src/com/fh/controller/sunvote/homework/HomeworkController.java                                     | 171 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 src/com/fh/controller/sunvote/instantpaper1/InstantPaper1Controller.java                           |   6 ------
 src/com/fh/controller/sunvote/instantpaper1content/InstantPaper1ContentController.java             |   6 ------
 src/com/fh/controller/sunvote/instantquestiondatasource1/InstantQuestionDataSource1Controller.java |  18 +++++++-----------
 src/com/fh/controller/system/login/LoginController.java                                            |   9 +++++++++
 src/com/fh/service/sunvote/homework/HomeworkReportManager.java                                     |   7 +++++++
 src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java                                |   5 +++++
 src/com/fh/util/Watermark.java                                                                     |  12 ++++++------
 14 files changed, 231 insertions(+), 35 deletions(-)

diff --git a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
index f51d85c..c39b689 100644
--- a/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
+++ b/WebRoot/WEB-INF/jsp/sunvote/teacher/teacher_main.jsp
@@ -67,7 +67,7 @@
 						<p>测验分析</p>
 						<ul class="menu_2">
 							<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
-								<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p>${var.CLASS_NAME}${var.CNAME}
+								<li onclick="event.stopPropagation();report('${var.CLASS_ID}')"><p title="${var.CLASS_NAME}${var.CNAME}">${var.CLASS_NAME}${var.CNAME}
 										成绩</p></li>
 							</c:forEach>
 						</ul>
@@ -89,8 +89,7 @@
 						<p>测验分析</p>
 						<ul class="menu_2">
 							<c:forEach items="${pd.CLASSINFO}" var="var" varStatus="vs">
-								<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p>${var.CLASS_NAME}${var.CNAME}
-										成绩</p></li>
+								<li onclick="event.stopPropagation();report2('${var.CLASS_ID}')"><p title="${var.CLASS_NAME}${var.CNAME}成绩">${var.CLASS_NAME}${var.CNAME} 成绩</p></li>
 							</c:forEach>
 						</ul>
 					</li>
diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 71c6d0c..6ac1929 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -27,6 +27,7 @@
 		GET_SCORE,	
 		GET_SCORE_PERSENT,	
 		GET_MAX_SCORE,	
+		GET_MIN_SCORE,
 		QUESTION_COUNT,	
 		ANSWER_PERSENT,	
 		HOMEWORK_ID
@@ -52,6 +53,7 @@
 		#{GET_SCORE},	
 		#{GET_SCORE_PERSENT},	
 		#{GET_MAX_SCORE},	
+		#{GET_MIN_SCORE},	
 		#{QUESTION_COUNT},	
 		#{ANSWER_PERSENT},	
 		#{HOMEWORK_ID}
@@ -117,6 +119,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="GET_MIN_SCORE != null and GET_MIN_SCORE != ''">
+			GET_MIN_SCORE = #{GET_MIN_SCORE},
 			</if><if test="QUESTION_COUNT != null and QUESTION_COUNT != ''">
 			QUESTION_COUNT = #{QUESTION_COUNT},
 			</if><if test="ANSWER_PERSENT != null and ANSWER_PERSENT != ''">
diff --git a/resources/mybatis1/sunvote/HomeworkReportMapper.xml b/resources/mybatis1/sunvote/HomeworkReportMapper.xml
index 6c4cf3e..13d1eba 100644
--- a/resources/mybatis1/sunvote/HomeworkReportMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkReportMapper.xml
@@ -113,6 +113,15 @@
 			HOMEWORK_ID = #{HOMEWORK_ID}
 	</select>
 	
+	<select id="findNoAnswerByHomeworkID" parameterType="pd" resultType="pd">
+		select 
+		<include refid="Field"></include>
+		from 
+		<include refid="tableName"></include>
+		where 
+			HOMEWORK_ID = #{HOMEWORK_ID}  and (answer is null or GET_SCORE = '0') 
+	</select>
+	
 	<!-- 列表 -->
 	<select id="datalistPage" parameterType="page" resultType="pd">
 		select
diff --git a/resources/mybatis1/sunvote/InstantQuestionDataSource1Mapper.xml b/resources/mybatis1/sunvote/InstantQuestionDataSource1Mapper.xml
index befe19d..55f42ab 100644
--- a/resources/mybatis1/sunvote/InstantQuestionDataSource1Mapper.xml
+++ b/resources/mybatis1/sunvote/InstantQuestionDataSource1Mapper.xml
@@ -19,7 +19,7 @@
 		GRADE_ID,	
 		SCHOOL_ID,	
 		USER_ID,	
-		创建时间,	
+		CREATE_DATE,	
 		CLASS_ID,	
 		INSTANTQUESTIONDATASOURCE1_ID
 	</sql>
@@ -36,7 +36,7 @@
 		#{GRADE_ID},	
 		#{SCHOOL_ID},	
 		#{USER_ID},	
-		#{创建时间},	
+		#{CREATE_DATE},	
 		#{CLASS_ID},	
 		#{INSTANTQUESTIONDATASOURCE1_ID}
 	</sql>
@@ -75,7 +75,7 @@
 			GRADE_ID = #{GRADE_ID},
 			SCHOOL_ID = #{SCHOOL_ID},
 			USER_ID = #{USER_ID},
-			创建时间 = #{创建时间},
+			创建时间 = #{CREATE_DATE},
 			CLASS_ID = #{CLASS_ID},
 		INSTANTQUESTIONDATASOURCE1_ID = INSTANTQUESTIONDATASOURCE1_ID
 		where 
diff --git a/src/com/fh/bean/ResultHomework.java b/src/com/fh/bean/ResultHomework.java
index 9f160fc..4907271 100644
--- a/src/com/fh/bean/ResultHomework.java
+++ b/src/com/fh/bean/ResultHomework.java
@@ -13,6 +13,7 @@ public class ResultHomework {
 	private String COMPLETE_DESC;
 	private String GET_MAX_SCORE;
 	private String ANSWER_PERSENT;
+	private String GET_MIN_SCORE;
 	private List<ResultStudent> STUDENTS;
 
 	public void setHOMEWORK_ID(String HOMEWORK_ID) {
@@ -71,7 +72,13 @@ public class ResultHomework {
 		return STUDENTS;
 	}
 	
+	public String getGET_MIN_SCORE() {
+		return GET_MIN_SCORE;
+	}
 	
+	public void setGET_MIN_SCORE(String gET_MIN_SCORE) {
+		GET_MIN_SCORE = gET_MIN_SCORE;
+	}
 	
 	public String getANSWER_PERSENT() {
 		return ANSWER_PERSENT;
diff --git a/src/com/fh/controller/api/V1.java b/src/com/fh/controller/api/V1.java
index a75b50c..e892dae 100644
--- a/src/com/fh/controller/api/V1.java
+++ b/src/com/fh/controller/api/V1.java
@@ -2908,6 +2908,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("GET_MIN_SCORE", resultHomework.getGET_MIN_SCORE());
 			homePd.put("ANSWER_PERSENT", resultHomework.getANSWER_PERSENT());
 			homePd.put("COMPLETE_COUNT", "1");
 			homeworkService.edit(homePd);
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index d0c3dcd..3cb7cd6 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -16,6 +16,7 @@ import javax.annotation.Resource;
 
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.WebDataBinder;
 import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -39,6 +40,7 @@ import com.fh.util.AppUtil;
 import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
+import com.fh.util.StringUtil;
 import com.google.gson.Gson;
 
 /**
@@ -290,6 +292,173 @@ public class HomeworkController extends BaseController {
 	
 	
 	/**
+	 * 传入homework_id 
+	 * 查询该场课后练的整体情况，最高分，最低分，平均分，总分，总题数，未答人数等
+	 * 未答人数列表
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/report2")
+	public ModelAndView report2() throws Exception {
+		PageData pageData = this.getPageData();
+		ModelAndView modelAndView = getModelAndView();
+		
+		String homeworkId = pageData.getString("HOMEWORK_ID");
+		if(!StringUtils.isEmpty(homeworkId.trim())){
+			pageData = homeworkService.findById(pageData);
+			List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
+			pageData.put("NO_COUNT", data.size());
+			modelAndView.addObject("pageData", pageData); // 报表统计情况
+			modelAndView.addObject("data", data);// 未答学生列表
+			
+		}
+		if(isChineseLanguageClient()){
+			modelAndView.setViewName("sunvote/homework/??????");
+		}else{
+			modelAndView.setViewName("sunvote/homework/??????");
+		}
+		
+		return modelAndView;
+	}
+	
+	/**
+	 * 传入homework_id 
+	 * index 第几题
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/homeworkindexview")
+	public ModelAndView homeworkindexview() throws Exception {
+		PageData pageData = this.getPageData();
+		ModelAndView modelAndView = getModelAndView();
+		
+		String homeworkId = pageData.getString("HOMEWORK_ID");
+		String index = pageData.getString("INDEX");
+		int indexint = Integer.parseInt(index);
+		List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
+		List<PageData> result = new ArrayList();
+		PageData aresult = new PageData();
+		aresult.put("ANSWER", "A");
+		PageData bresult = new PageData();
+		bresult.put("ANSWER", "B");
+		PageData cresult = new PageData();
+		cresult.put("ANSWER", "C");
+		PageData dresult = new PageData();
+		dresult.put("ANSWER", "D");
+		PageData eresult = new PageData();
+		eresult.put("ANSWER", "");
+		result.add(aresult);
+		result.add(bresult);
+		result.add(cresult);
+		result.add(dresult);
+		result.add(eresult);
+		for(PageData pd : data){
+			String answer = pd.getString("ANSWER");
+			if(!StringUtils.isEmpty(answer)){
+				String[] answers = answer.split(";");
+				if(answers.length >= indexint -1){
+					String ans = answers[indexint - 1];
+					String[] anss = ans.split(":");
+					if(anss != null && anss.length == 2){
+						PageData tresult = null;
+						for(PageData ptd : result){
+							if(anss[0].toUpperCase().equals(anss[0].toUpperCase())){
+								tresult = ptd;
+							}
+						}
+						if(tresult == null){
+							tresult = new PageData();
+							result.add(tresult);
+						}
+						List<String> list = (List)tresult.get("STUDENTS");
+						if(list == null){
+							list = new ArrayList();
+						}
+						list.add(pd.getString("STUDENT_NAME"));
+						tresult.put("ANSWER", anss[0].toUpperCase());
+						tresult.put("STUDENTS", list);
+						tresult.put("RIGHT", !"0".equals(anss[1]));
+					}
+				}
+			}
+		}
+		
+		modelAndView.addObject("datas", new Gson().toJson(result));
+//		modelAndView.addObject("datas",result);
+		
+		modelAndView.setViewName("");
+		return modelAndView;
+	}
+	
+	
+	/**
+	 * 传入homework_id 
+	 * index 第几题
+	 * @return
+	 * @throws Exception
+	 */
+	@RequestMapping(value = "/homeworkindex")
+	@ResponseBody
+	public Object homeworkindex() throws Exception {
+		PageData pageData = this.getPageData();
+		
+		String homeworkId = pageData.getString("HOMEWORK_ID");
+		String index = pageData.getString("INDEX");
+		int indexint = Integer.parseInt(index);
+		List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
+		List<PageData> result = new ArrayList();
+		PageData aresult = new PageData();
+		aresult.put("ANSWER", "A");
+		PageData bresult = new PageData();
+		bresult.put("ANSWER", "B");
+		PageData cresult = new PageData();
+		cresult.put("ANSWER", "C");
+		PageData dresult = new PageData();
+		dresult.put("ANSWER", "D");
+		PageData eresult = new PageData();
+		eresult.put("ANSWER", "");
+		result.add(aresult);
+		result.add(bresult);
+		result.add(cresult);
+		result.add(dresult);
+		result.add(eresult);
+		for(PageData pd : data){
+			String answer = pd.getString("ANSWER");
+			if(!StringUtils.isEmpty(answer)){
+				String[] answers = answer.split(";");
+				if(answers.length >= indexint -1){
+					String ans = answers[indexint - 1];
+					String[] anss = ans.split(":");
+					if(anss != null && anss.length == 2){
+						PageData tresult = null;
+						for(PageData ptd : result){
+							if(anss[0].toUpperCase().equals(anss[0].toUpperCase())){
+								tresult = ptd;
+							}
+						}
+						if(tresult == null){
+							tresult = new PageData();
+							result.add(tresult);
+						}
+						List<String> list = (List)tresult.get("STUDENTS");
+						if(list == null){
+							list = new ArrayList();
+						}
+						list.add(pd.getString("STUDENT_NAME"));
+						tresult.put("ANSWER", anss[0].toUpperCase());
+						tresult.put("STUDENTS", list);
+						tresult.put("RIGHT", !"0".equals(anss[1]));
+					}
+				}
+			}
+		}
+		return new Gson().toJson(result);
+		
+	}
+	
+	
+	
+	/**
 	 * 去修改页面
 	 * 
 	 * @param
@@ -953,4 +1122,6 @@ public class HomeworkController extends BaseController {
 		}
 		return responseGson.toJson();
 	}
+	
+	
 }
diff --git a/src/com/fh/controller/sunvote/instantpaper1/InstantPaper1Controller.java b/src/com/fh/controller/sunvote/instantpaper1/InstantPaper1Controller.java
index 217b0e2..5d73fb9 100644
--- a/src/com/fh/controller/sunvote/instantpaper1/InstantPaper1Controller.java
+++ b/src/com/fh/controller/sunvote/instantpaper1/InstantPaper1Controller.java
@@ -45,7 +45,6 @@ public class InstantPaper1Controller extends BaseController {
 	@RequestMapping(value="/save")
 	public ModelAndView save() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"新增InstantPaper1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -64,7 +63,6 @@ public class InstantPaper1Controller extends BaseController {
 	@RequestMapping(value="/delete")
 	public void delete(PrintWriter out) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"删除InstantPaper1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		instantpaper1Service.delete(pd);
@@ -79,7 +77,6 @@ public class InstantPaper1Controller extends BaseController {
 	@RequestMapping(value="/edit")
 	public ModelAndView edit() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"修改InstantPaper1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -96,7 +93,6 @@ public class InstantPaper1Controller extends BaseController {
 	@RequestMapping(value="/list")
 	public ModelAndView list(Page page) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"列表InstantPaper1");
-		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -152,7 +148,6 @@ public class InstantPaper1Controller extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"批量删除InstantPaper1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
 		PageData pd = new PageData();		
 		Map<String,Object> map = new HashMap<String,Object>();
 		pd = this.getPageData();
@@ -177,7 +172,6 @@ public class InstantPaper1Controller extends BaseController {
 	@RequestMapping(value="/excel")
 	public ModelAndView exportExcel() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"导出InstantPaper1到excel");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
diff --git a/src/com/fh/controller/sunvote/instantpaper1content/InstantPaper1ContentController.java b/src/com/fh/controller/sunvote/instantpaper1content/InstantPaper1ContentController.java
index 33bebb5..968c091 100644
--- a/src/com/fh/controller/sunvote/instantpaper1content/InstantPaper1ContentController.java
+++ b/src/com/fh/controller/sunvote/instantpaper1content/InstantPaper1ContentController.java
@@ -45,7 +45,6 @@ public class InstantPaper1ContentController extends BaseController {
 	@RequestMapping(value="/save")
 	public ModelAndView save() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"新增InstantPaper1Content");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -63,7 +62,6 @@ public class InstantPaper1ContentController extends BaseController {
 	@RequestMapping(value="/delete")
 	public void delete(PrintWriter out) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"删除InstantPaper1Content");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		instantpaper1contentService.delete(pd);
@@ -78,7 +76,6 @@ public class InstantPaper1ContentController extends BaseController {
 	@RequestMapping(value="/edit")
 	public ModelAndView edit() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"修改InstantPaper1Content");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -95,7 +92,6 @@ public class InstantPaper1ContentController extends BaseController {
 	@RequestMapping(value="/list")
 	public ModelAndView list(Page page) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"列表InstantPaper1Content");
-		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -151,7 +147,6 @@ public class InstantPaper1ContentController extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"批量删除InstantPaper1Content");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
 		PageData pd = new PageData();		
 		Map<String,Object> map = new HashMap<String,Object>();
 		pd = this.getPageData();
@@ -176,7 +171,6 @@ public class InstantPaper1ContentController extends BaseController {
 	@RequestMapping(value="/excel")
 	public ModelAndView exportExcel() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"导出InstantPaper1Content到excel");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
diff --git a/src/com/fh/controller/sunvote/instantquestiondatasource1/InstantQuestionDataSource1Controller.java b/src/com/fh/controller/sunvote/instantquestiondatasource1/InstantQuestionDataSource1Controller.java
index b88e78a..c469c38 100644
--- a/src/com/fh/controller/sunvote/instantquestiondatasource1/InstantQuestionDataSource1Controller.java
+++ b/src/com/fh/controller/sunvote/instantquestiondatasource1/InstantQuestionDataSource1Controller.java
@@ -8,7 +8,9 @@ import java.util.Date;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+
 import javax.annotation.Resource;
+
 import org.springframework.beans.propertyeditors.CustomDateEditor;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.WebDataBinder;
@@ -16,14 +18,14 @@ import org.springframework.web.bind.annotation.InitBinder;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
+
 import com.fh.controller.base.BaseController;
 import com.fh.entity.Page;
+import com.fh.service.sunvote.instantquestiondatasource1.InstantQuestionDataSource1Manager;
 import com.fh.util.AppUtil;
+import com.fh.util.Jurisdiction;
 import com.fh.util.ObjectExcelView;
 import com.fh.util.PageData;
-import com.fh.util.Jurisdiction;
-import com.fh.util.Tools;
-import com.fh.service.sunvote.instantquestiondatasource1.InstantQuestionDataSource1Manager;
 
 /** 
  * 说明：即时测题库1
@@ -45,7 +47,6 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 	@RequestMapping(value="/save")
 	public ModelAndView save() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"新增InstantQuestionDataSource1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "add")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -63,7 +64,6 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 	@RequestMapping(value="/delete")
 	public void delete(PrintWriter out) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"删除InstantQuestionDataSource1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return;} //校验权限
 		PageData pd = new PageData();
 		pd = this.getPageData();
 		instantquestiondatasource1Service.delete(pd);
@@ -78,7 +78,6 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 	@RequestMapping(value="/edit")
 	public ModelAndView edit() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"修改InstantQuestionDataSource1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "edit")){return null;} //校验权限
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -95,7 +94,6 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 	@RequestMapping(value="/list")
 	public ModelAndView list(Page page) throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"列表InstantQuestionDataSource1");
-		//if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;} //校验权限(无权查看时页面会有提示,如果不注释掉这句代码就无法进入列表页面,所以根据情况是否加入本句代码)
 		ModelAndView mv = this.getModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -151,7 +149,6 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 	@ResponseBody
 	public Object deleteAll() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"批量删除InstantQuestionDataSource1");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "del")){return null;} //校验权限
 		PageData pd = new PageData();		
 		Map<String,Object> map = new HashMap<String,Object>();
 		pd = this.getPageData();
@@ -176,7 +173,6 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 	@RequestMapping(value="/excel")
 	public ModelAndView exportExcel() throws Exception{
 		logBefore(logger, Jurisdiction.getUsername()+"导出InstantQuestionDataSource1到excel");
-		if(!Jurisdiction.buttonJurisdiction(menuUrl, "cha")){return null;}
 		ModelAndView mv = new ModelAndView();
 		PageData pd = new PageData();
 		pd = this.getPageData();
@@ -192,7 +188,7 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 		titles.add("年级");	//8
 		titles.add("学校");	//9
 		titles.add("用户ID");	//10
-		titles.add("create_time");	//11
+		titles.add("创建时间");	//11
 		titles.add("班级");	//12
 		dataMap.put("titles", titles);
 		List<PageData> varOList = instantquestiondatasource1Service.listAll(pd);
@@ -209,7 +205,7 @@ public class InstantQuestionDataSource1Controller extends BaseController {
 			vpd.put("var8", varOList.get(i).getString("GRADE_ID"));	    //8
 			vpd.put("var9", varOList.get(i).getString("SCHOOL_ID"));	    //9
 			vpd.put("var10", varOList.get(i).getString("USER_ID"));	    //10
-			vpd.put("var11", varOList.get(i).getString("创建时间"));	    //11
+			vpd.put("var11", varOList.get(i).getString("CREATE_DATE"));	    //11
 			vpd.put("var12", varOList.get(i).getString("CLASS_ID"));	    //12
 			varList.add(vpd);
 		}
diff --git a/src/com/fh/controller/system/login/LoginController.java b/src/com/fh/controller/system/login/LoginController.java
index 7225053..be93963 100644
--- a/src/com/fh/controller/system/login/LoginController.java
+++ b/src/com/fh/controller/system/login/LoginController.java
@@ -257,6 +257,15 @@ public class LoginController extends BaseController {
 					session.setAttribute(USERNAME + Const.ROLE_ID,
 							"teacher");
 					session.setAttribute(Const.SESSION_USERNAME, USERNAME); // 放入用户名到session
+					session.setAttribute(getUsername()
+							+ Const.SCHOOL_ID, teacherInfo.get("SCHOOL_ID"));
+					session.setAttribute(getUsername()
+							+ Const.SCHOOL_NAME, teacherInfo.get("SNAME"));
+					session.setAttribute(getUsername()
+							+ Const.GRADE_ID, teacherInfo.get("GRADE_ID"));
+					session.setAttribute(getUsername()
+							+ Const.SUBJECT_ID, teacherInfo.get("SUBJECT_ID"));
+					
 					if(isChineseLanguageClient()){
 						mv.setViewName("sunvote/teacher/teacher_main");
 					}else{
diff --git a/src/com/fh/service/sunvote/homework/HomeworkReportManager.java b/src/com/fh/service/sunvote/homework/HomeworkReportManager.java
index 4e8eb3a..0ddaf09 100644
--- a/src/com/fh/service/sunvote/homework/HomeworkReportManager.java
+++ b/src/com/fh/service/sunvote/homework/HomeworkReportManager.java
@@ -57,6 +57,13 @@ public interface HomeworkReportManager{
 	 * @throws Exception
 	 */
 	public List<PageData> findByHomeworkID(PageData pd)throws Exception;
+	/**
+	 * 
+	 * @param pd
+	 * @return
+	 * @throws Exception
+	 */
+	public List<PageData> findNoAnswerByHomeworkID(PageData pd)throws Exception;
 	
 	/**列表(全部)
 	 * @param pd
diff --git a/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java b/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java
index 96fa3bc..91c0af0 100644
--- a/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java
+++ b/src/com/fh/service/sunvote/homework/impl/HomeworkReportService.java
@@ -82,6 +82,11 @@ public class HomeworkReportService implements HomeworkReportManager{
 		return (List<PageData>)dao.findForList("HomeworkReportMapper.findByHomeworkID", pd);
 	}
 	
+	@SuppressWarnings("unchecked")
+	public List<PageData> findNoAnswerByHomeworkID(PageData pd)throws Exception{
+		return (List<PageData>)dao.findForList("HomeworkReportMapper.findNoAnswerByHomeworkID", pd);
+	}
+	
 	/**通过id获取数据
 	 * @param pd
 	 * @throws Exception
diff --git a/src/com/fh/util/Watermark.java b/src/com/fh/util/Watermark.java
index 63f1f22..a0abc1f 100644
--- a/src/com/fh/util/Watermark.java
+++ b/src/com/fh/util/Watermark.java
@@ -10,8 +10,8 @@ import java.io.FileOutputStream;
 
 import javax.imageio.ImageIO;
 
-import com.sun.image.codec.jpeg.JPEGCodec;
-import com.sun.image.codec.jpeg.JPEGImageEncoder;
+//import com.sun.image.codec.jpeg.JPEGCodec;
+//import com.sun.image.codec.jpeg.JPEGImageEncoder;
 
 public class Watermark {
 	
@@ -89,8 +89,8 @@ public class Watermark {
 	            //水印文件结束
 	            g.dispose();
 	            FileOutputStream out = new FileOutputStream(targetImg);
-	            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-	            encoder.encode(image);
+//	            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
+//	            encoder.encode(image);
 	            out.close();
 	        } catch (Exception e) {
 	            e.printStackTrace();
@@ -133,8 +133,8 @@ public class Watermark {
 	            g.drawString(pressText, x, y);
 	            g.dispose();
 	            FileOutputStream out = new FileOutputStream(targetImg);
-	            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
-	            encoder.encode(image);
+//	            JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(out);
+//	            encoder.encode(image);
 	            out.close();
 	        } catch (Exception e) {
 	            System.out.println(e);
--
libgit2 0.21.4