From 80838e9ce035b4736bc0c00dfcf1cf9ddfba3a4b Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Wed, 10 Apr 2019 14:55:05 +0800
Subject: [PATCH] 修改时间不能使用的bug

---
 resources/mybatis1/sunvote/HomeworkMapper.xml                  |  4 ++--
 src/com/fh/controller/sunvote/homework/HomeworkController.java | 25 ++++++++++++++++++-------
 2 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 3ce1dae..e8f6faa 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -225,7 +225,7 @@
 			and COMPLETE_DATE = #{COMPLETE_DATE}
 		</if>
 		<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
-			and COMPLETE_DATE &lt; #{START_DATE}
+			and COMPLETE_DATE &gt; #{START_DATE}
 		</if>
 		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &lt; #{END_DATE}
@@ -311,7 +311,7 @@
 				and STUDENT_ID = #{STUDENT_ID}
 			</if>
 			<if test="START_DATE != null and START_DATE != ''"><!-- 关键词检索 -->
-				and COMPLETE_DATE &lt; #{START_DATE}
+				and COMPLETE_DATE &gt; #{START_DATE}
 			</if>
 			<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
 				and COMPLETE_DATE &lt; #{END_DATE}
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index d572136..0fd2bac 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -380,8 +380,6 @@ 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");
@@ -394,8 +392,15 @@ public class HomeworkController extends BaseController {
 			pd.put("START_DATE", getWeekStart(current));
 			pd.put("END_DATE", getWeekEnd(current));
 		}
-		List<PageData> dataList = homeworkService.report(pd);
-		pd.put("DATA", dataList);
+		
+		if(pd.get("STUDENT_ID") != null){
+			List<PageData> dataList = homeworkService.report(pd);
+			pd.put("DATA", dataList);
+		}
+		if(pd.get("CLASS_ID") != null){
+			List<PageData> studentList = studentService.findByClassId(pd);
+			pd.put("STUDENTS", studentList);
+		}
 		pd.remove("JSON");
 		mv.setViewName("sunvote/homework/homework_student_report");
 		mv.addObject("pd", pd);
@@ -416,7 +421,6 @@ public class HomeworkController extends BaseController {
 		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");
@@ -429,8 +433,15 @@ public class HomeworkController extends BaseController {
 			pd.put("START_DATE", getWeekStart(current));
 			pd.put("END_DATE", getWeekEnd(current));
 		}
-		List<PageData> dataList = homeworkService.report(pd);
-		pd.put("DATA", dataList);
+		if(pd.get("HOMEWORK_ID") != null){
+			List<PageData> dataList = homeworkService.report(pd);
+			pd.put("DATA", dataList);
+		}
+		if(pd.get("CLASS_ID") != null){
+			List<PageData> studentList = studentService.findByClassId(pd);
+			pd.put("STUDENTS", studentList);
+		}
+		
 		pd.remove("JSON");
 		mv.setViewName("sunvote/homework/homework_item_report");
 		mv.addObject("pd", pd);
--
libgit2 0.21.4