Commit 0a4dfe03e228f713f2c7b4e25cc1b969dac4ac50

Authored by 孙向锦
1 parent b7b13eb4

修改报表数据不应该出现的bug

resources/mybatis1/sunvote/HomeworkMapper.xml
@@ -248,6 +248,9 @@ @@ -248,6 +248,9 @@
248 <if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 --> 248 <if test="END_DATE != null and END_DATE != ''"><!-- 关键词检索 -->
249 and COMPLETE_DATE &lt; #{END_DATE} 249 and COMPLETE_DATE &lt; #{END_DATE}
250 </if> 250 </if>
  251 + <if test="COMPLETE_COUNT != null and COMPLETE_COUNT != ''"><!-- 关键词检索 -->
  252 + and COMPLETE_COUNT = #{COMPLETE_COUNT}
  253 + </if>
251 ORDER BY COMPLETE_DATE DESC 254 ORDER BY COMPLETE_DATE DESC
252 </select> 255 </select>
253 256
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -312,7 +312,7 @@ public class HomeworkController extends BaseController { @@ -312,7 +312,7 @@ public class HomeworkController extends BaseController {
312 // 对应班级数据 312 // 对应班级数据
313 PageData data = new PageData(); 313 PageData data = new PageData();
314 List<PageData> studentList = studentService.findByClassId(pd); 314 List<PageData> studentList = studentService.findByClassId(pd);
315 - 315 + pd.put("COMPLETE_COUNT", "1");
316 List<PageData> homeworkList = homeworkService.listAll(pd); 316 List<PageData> homeworkList = homeworkService.listAll(pd);
317 List<PageData> dataList = homeworkService.report(pd); 317 List<PageData> dataList = homeworkService.report(pd);
318 for (PageData stuPd : studentList) { 318 for (PageData stuPd : studentList) {