孙向锦 / SunvoteEducation

Commit 3f6c3003d50775d027fb41bcf0a1955eac020cae

Authored by 孙向锦
1 parent e9f47f90

更新计算方式

Inline Side-by-side
Showing 3 changed files with 9 additions and 7 deletions
WebRoot/WEB-INF/jsp/sunvote/admin/admin_main.jsp
  View file @3f6c300
... ... @@ -151,7 +151,7 @@
151 151  
152 152 </li>
153 153 <li>
154   - <p>年级设置</p>
  154 + <p >年级设置</p>
155 155 </li>
156 156 <li>
157 157 <p>年级升级</p>
... ...
resources/mybatis1/sunvote/TestPaperInfoMapper.xml
  View file @3f6c300
... ... @@ -281,6 +281,7 @@
281 281 LEFT JOIN sv_paperquestion ON sv_testpaperinfo.QUESTION_ID = sv_paperquestion.QUESTION_ID
282 282 WHERE
283 283 sv_testpaperinfo.TEST_ID = #{TEST_ID}
  284 + AND sv_student.ID IS NOT NULL
284 285 ORDER BY
285 286 sv_testpaperinfo.STUDENT_ID,
286 287 (sv_paperquestion.RANK * 1)
... ...
src/com/fh/controller/sunvote/report/ReportController.java
  View file @3f6c300
1 1 package com.fh.controller.sunvote.report;
2 2  
  3 +import java.math.BigDecimal;
3 4 import java.util.ArrayList;
4 5 import java.util.Collections;
5 6 import java.util.Comparator;
... ... @@ -101,8 +102,8 @@ public class ReportController extends BaseController {
101 102 List<PageData> testpaperList = new ArrayList();
102 103 List<PageData> studentList = new ArrayList();
103 104 PageData studentPd = null;
104   - float totalScore = 0 ;
105   - float getScore = 0 ;
  105 + double totalScore = 0 ;
  106 + double getScore = 0 ;
106 107 for(PageData item : reportData){
107 108  
108 109 // 学生列表
... ... @@ -117,14 +118,14 @@ public class ReportController extends BaseController {
117 118 String totalScoreStr = item.getString("TOTAL_SCORE");
118 119 if(totalScoreStr != null){
119 120 try{
120   - totalScore +=Float.parseFloat(totalScoreStr);
  121 + totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
121 122 }catch(Exception ex){
122 123 logger.info(ex);
123 124 }
124 125 }
125 126 if(score != null){
126 127 try{
127   - getScore += Float.parseFloat(score);
  128 + getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
128 129 }catch(Exception ex){
129 130 logger.info(ex);
130 131 }
... ... @@ -149,14 +150,14 @@ public class ReportController extends BaseController {
149 150 String totalScoreStr = item.getString("TOTAL_SCORE");
150 151 if(totalScoreStr != null){
151 152 try{
152   - totalScore += Float.parseFloat(totalScoreStr);
  153 + totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
153 154 }catch(Exception ex){
154 155 logger.info(ex);
155 156 }
156 157 }
157 158 if(score != null){
158 159 try{
159   - getScore += Float.parseFloat(score);
  160 + getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
160 161 }catch(Exception ex){
161 162 logger.info(ex);
162 163 }
... ...