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

jack
2 parents 4faf6356 b7b13eb4
Showing 3 changed files with 23 additions and 6 deletions
resources/mybatis1/sunvote/HomeworkMapper.xml
resources/mybatis1/sunvote/HomeworkReportMapper.xml
src/com/fh/controller/sunvote/homework/HomeworkController.java
@@ -305,6 +305,7 @@
  
 		SELECT
 				sv_homeworkreport.STUDENT_ID,
+				sv_homeworkreport.COMPLETE_COUNT,
 				sv_homeworkreport.ANSWER,
 				sv_homeworkreport.RANK,
 				sv_homeworkreport.STUDENT_NAME,
@@ -313,6 +314,7 @@
 				sv_homework.HOMEWORK_ID,
 				sv_homework.COMPLETE_DESC,
 				sv_homework.NAME,
+				sv_homework.QUESTION_COUNT,
 				sv_homework.GET_MAX_SCORE,
 				sv_homeworkreport.STUDNET_NO,
 				sv_homework.COMPLETE_DATE,
@@ -17,7 +17,7 @@
 		RIGHT_PERSENT,	
 		GET_SCORE,	
 		ANSWER,	
-		WHETHER,	
+		COMPLETE_COUNT,	
 		HOMEWORK_ID
 	</sql>
  
@@ -31,7 +31,7 @@
 		#{RIGHT_PERSENT},	
 		#{GET_SCORE},	
 		#{ANSWER},	
-		#{WHETHER},	
+		#{COMPLETE_COUNT},	
 		#{HOMEWORK_ID}
 	</sql>
  
@@ -66,7 +66,7 @@
 		RIGHT_PERSENT = #{RIGHT_PERSENT},
 		GET_SCORE = #{GET_SCORE},
 		ANSWER = #{ANSWER},
-		WHETHER = #{WHETHER},
+		COMPLETE_COUNT = #{COMPLETE_COUNT},
 		HOMEWORK_ID = #{HOMEWORK_ID}
 		where 
 		HOMEWORK_REPORT_ID = #{HOMEWORK_REPORT_ID}
@@ -170,7 +170,7 @@
 		#{item.GET_SCORE},	
 		#{item.ANSWER},	
 		#{item.HOMEWORK_ID}
-		#{item.WHETHER}
+		#{item.COMPLETE_COUNT}
        )
      </foreach>
      </insert>
@@ -318,6 +318,8 @@ public class HomeworkController extends BaseController {
 			for (PageData stuPd : studentList) {
 				double all = 0;
 				double get = 0;
+				int sc = 0 ;
+				int ac = 0 ;
 				for (PageData dpd : dataList) {
 					if (dpd.get("STUDENT_ID").equals(stuPd.get("ID"))) {
 						stuPd.put(dpd.get("HOMEWORK_ID"),
@@ -334,12 +336,25 @@ public class HomeworkController extends BaseController {
 						} catch (Exception ex) {
  
 						}
+						try {
+							sc += Integer.parseInt(dpd.get("COMPLETE_COUNT")
+									.toString());
+						} catch (Exception ex) {
+
+						}
+						try {
+							ac += Integer.parseInt(dpd.get("QUESTION_COUNT")
+									.toString());
+						} catch (Exception ex) {
+							
+						}
+						
 					}
 				}
 				stuPd.put("STUDENT_ALL_SCORE", get);
 				stuPd.put("PAPER_ALL_SCORE", all);
-				stuPd.put("COMPLETE_COUNT", 1);
-				stuPd.put("ALL_COUNT", 1);
+				stuPd.put("COMPLETE_COUNT", sc);
+				stuPd.put("ALL_COUNT", ac);
 				stuPd.remove("SCHOOL_ID");
 				stuPd.remove("SEX");
 				stuPd.remove("CLASS_ID");