From 0a4dfe03e228f713f2c7b4e25cc1b969dac4ac50 Mon Sep 17 00:00:00 2001
From: Elvis <eluis@psunsky.com>
Date: Fri, 12 Apr 2019 11:50:20 +0800
Subject: [PATCH] 修改报表数据不应该出现的bug

---
 resources/mybatis1/sunvote/HomeworkMapper.xml                  | 3 +++
 src/com/fh/controller/sunvote/homework/HomeworkController.java | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/resources/mybatis1/sunvote/HomeworkMapper.xml b/resources/mybatis1/sunvote/HomeworkMapper.xml
index 7cb58c9..8cb40fa 100644
--- a/resources/mybatis1/sunvote/HomeworkMapper.xml
+++ b/resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -248,6 +248,9 @@
 		<if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
 			and COMPLETE_DATE &lt; #{END_DATE}
 		</if>
+		<if test="COMPLETE_COUNT != null and COMPLETE_COUNT != ''"><!-- 关键词检索 -->
+			and COMPLETE_COUNT = #{COMPLETE_COUNT}
+		</if>
 		ORDER BY COMPLETE_DATE DESC
 	</select>
 	
diff --git a/src/com/fh/controller/sunvote/homework/HomeworkController.java b/src/com/fh/controller/sunvote/homework/HomeworkController.java
index 75ea55a..7169a48 100644
--- a/src/com/fh/controller/sunvote/homework/HomeworkController.java
+++ b/src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -312,7 +312,7 @@ public class HomeworkController extends BaseController {
 			// 对应班级数据
 			PageData data = new PageData();
 			List<PageData> studentList = studentService.findByClassId(pd);
-
+			pd.put("COMPLETE_COUNT", "1");
 			List<PageData> homeworkList = homeworkService.listAll(pd);
 			List<PageData> dataList = homeworkService.report(pd);
 			for (PageData stuPd : studentList) {
--
libgit2 0.21.4