9338b563
孙向锦
添加报表
|
1
2
|
package com.fh.controller.sunvote.report;
|
066f7673
孙向锦
修复bug
|
3
4
5
|
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
|
9338b563
孙向锦
添加报表
|
6
7
8
9
10
11
12
13
14
15
16
|
import java.util.List;
import javax.annotation.Resource;
import org.springframework.stereotype.Controller;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
import com.fh.controller.api.ResponseGson;
import com.fh.controller.base.BaseController;
|
eca4feb5
孙向锦
管理员功能完善
|
17
|
import com.fh.service.api.V1Manager;
|
9338b563
孙向锦
添加报表
|
18
19
20
|
import com.fh.service.sunvote.sclass.SClassManager;
import com.fh.service.sunvote.student.StudentManager;
import com.fh.service.sunvote.studenttest.StudentTestManager;
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
21
22
|
import com.fh.service.sunvote.subject.SubjectManager;
import com.fh.service.sunvote.teacher.TeacherManager;
|
9338b563
孙向锦
添加报表
|
23
|
import com.fh.service.sunvote.testpaper.TestPaperManager;
|
066f7673
孙向锦
修复bug
|
24
|
import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
|
9338b563
孙向锦
添加报表
|
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
import com.fh.util.Jurisdiction;
import com.fh.util.PageData;
@Controller
@RequestMapping(value="/report")
public class ReportController extends BaseController {
@Resource(name="sclassService")
private SClassManager sclassService;
@Resource(name="studentService")
private StudentManager studentService;
@Resource(name="testpaperService")
private TestPaperManager testpaperService;
@Resource(name="studenttestService")
private StudentTestManager studenttestService;
|
066f7673
孙向锦
修复bug
|
44
45
46
|
@Resource(name="testpaperinfoService")
private TestPaperInfoManager testpaperinfoService;
|
eca4feb5
孙向锦
管理员功能完善
|
47
48
49
|
@Resource(name = "v1Service")
private V1Manager v1Service;
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
50
51
52
53
54
55
|
@Resource(name = "teacherService")
private TeacherManager teacherService;
@Resource(name="subjectService")
private SubjectManager subjectService;
|
9338b563
孙向锦
添加报表
|
56
57
58
59
60
61
62
63
64
|
@RequestMapping(value="/report")
public ModelAndView report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"班级报表");
ModelAndView mv = this.getModelAndView();
PageData pd = getPageData();
pd.put("SCLASS_ID", pd.get("CLASSID"));
pd.put("ID", pd.get("CLASSID"));
|
757dfed6
孙向锦
样例报表
|
65
|
pd.put("TEST_TYPE", "1");
|
eca4feb5
孙向锦
管理员功能完善
|
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
String role = pd.getString("ROLE");
if( role != null && "admin".equals(role)){
PageData tpd = new PageData();
tpd.put("ID", getUserID());
List<PageData> adminInfos = v1Service.getAdminInfo(tpd);
List<PageData> subjectInfos = new ArrayList<PageData>();
for(PageData pad : adminInfos){
PageData tmpd = new PageData();
Object gradeId = pad.get("GRADE_ID");
tmpd.put("SNAME", pad.get("SNAME"));// 学校名称
tmpd.put("SCHOOL_ID", pad.get("SCHOOL_ID"));//学校ID
tmpd.put("GRADE_ID", pad.get("GRADE_ID"));//年级id
tmpd.put("GNAME", pad.get("GNAME"));//年级名称
tmpd.put("SUBJECT_ID", pad.get("SUBJECT_ID"));// 科目id
tmpd.put("SCNAME", pad.get("SCNAME"));// 科目名称
if(gradeId != null && !"".equals(gradeId)){
}else{
subjectInfos.add(tmpd);
}
}
mv.addObject("subjectInfos", subjectInfos);
}else{
pd.put("TEACHER_ID", getUserID());
}
|
9338b563
孙向锦
添加报表
|
90
91
92
93
94
95
96
|
// 1 查询班级信息
PageData classPageData = sclassService.findById(pd);
PageData info = new PageData();
info.put("CLASS_NAME", classPageData.getString("CLASS_NAME"));
info.put("CLASS_CODE", classPageData.getString("CLASS_CODE"));
info.put("CLASS_ID", classPageData.getString("ID"));
pd.put("CLASS_ID", pd.get("CLASSID"));
|
eca4feb5
孙向锦
管理员功能完善
|
97
|
|
9338b563
孙向锦
添加报表
|
98
|
// 2查询班级考试
|
ddbc622f
孙向锦
0829版本
|
99
|
pd.put("TEST_TYPE", "1");
|
3a163205
孙向锦
报表优化
|
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
|
// List<PageData> testpaperList = testpaperService.listAll(pd);
// mv.addObject("testpaperList", testpaperList);
// info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
// modify 根據班級查詢班級報表
List<PageData> reportData = v1Service.classReport(pd);
List<PageData> testpaperList = new ArrayList();
List<PageData> studentList = new ArrayList();
PageData studentPd = null;
float totalScore = 0 ;
float getScore = 0 ;
for(PageData item : reportData){
// 学生列表
if(studentPd != null && item.get("STUDENT_ID").equals(studentPd.get("STUDENT_ID"))){
//
String score = item.getString("SCORE");
if(!"0".equals(score)){
studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
}else{
studentPd.put(item.get("TEST_ID"), "--");
}
String totalScoreStr = item.getString("TOTAL_SCORE");
if(totalScoreStr != null){
try{
totalScore +=Float.parseFloat(totalScoreStr);
}catch(Exception ex){
logger.info(ex);
}
}
if(score != null){
try{
getScore += Float.parseFloat(score);
}catch(Exception ex){
logger.info(ex);
}
}
}else{
if(studentPd != null){
studentPd.put("TOTALSCORE", totalScore);
studentPd.put("GETSCORE", getScore);
studentList.add(studentPd);
totalScore = 0 ;
getScore = 0 ;
}
studentPd = new PageData();
studentPd.put("STUDENT_ID", item.get("STUDENT_ID"));
studentPd.put("NAME", item.get("NAME"));
String score = item.getString("SCORE");
if(!"0".equals(score)){
studentPd.put(item.get("TEST_ID"), item.get("SCORE"));
}else{
studentPd.put(item.get("TEST_ID"), "--");
}
String totalScoreStr = item.getString("TOTAL_SCORE");
if(totalScoreStr != null){
try{
totalScore += Float.parseFloat(totalScoreStr);
}catch(Exception ex){
logger.info(ex);
}
}
if(score != null){
try{
getScore += Float.parseFloat(score);
}catch(Exception ex){
logger.info(ex);
}
}
}
PageData clone = new PageData(item);
// 试卷列表
if(!contain(testpaperList, clone, "TEST_ID")){
clone.put("TESTPAPER_ID", clone.get("TEST_ID"));
clone.put("NAME", clone.get("PAPER_NAME"));
testpaperList.add(clone);
}
}
if(studentPd != null){
studentPd.put("TOTALSCORE", totalScore);
studentPd.put("GETSCORE", getScore);
studentList.add(studentPd);
totalScore = 0 ;
getScore = 0 ;
}
Collections.sort(testpaperList,new Comparator<PageData>(){
@Override
public int compare(PageData o1, PageData o2) {
String o1GetScore = o1.getString("CREATE_DATE");
String o2GetScore = o2.getString("CREATE_DATE");
return - o1GetScore.compareToIgnoreCase(o2GetScore);
}
});
|
9338b563
孙向锦
添加报表
|
199
200
|
mv.addObject("testpaperList", testpaperList);
info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
|
3a163205
孙向锦
报表优化
|
201
202
203
|
/*
List<PageData> studentList = studentService.listAllClass(pd);
|
9338b563
孙向锦
添加报表
|
204
205
206
207
208
209
|
// 查询学生名单及人数
if(studentList != null && studentList.size() > 0){
for(PageData studentPageData : studentList){
studentPageData.put("STUDENT_ID", studentPageData.getString("ID"));
List<PageData> studentTestList = studenttestService.listAll(studentPageData);
for(PageData studentTestPageData :studentTestList){
|
02f157fa
孙向锦
修复2个bug
|
210
211
212
213
214
215
|
String score = studentTestPageData.getString("SCORE");
if(!"0".equals(score)){
studentPageData.put(studentTestPageData.getString("TEST_ID"), studentTestPageData.getString("SCORE"));
}else{
studentPageData.put(studentTestPageData.getString("TEST_ID"), "--");
}
|
9338b563
孙向锦
添加报表
|
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
|
}
int totalScore = 0 ;
int getScore = 0 ;
for(PageData testPaperPageData:testpaperList){
String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
if(totalScoreStr != null){
try{
totalScore += Integer.parseInt(totalScoreStr);
}catch(Exception ex){
logger.info(ex);
}
}
String getScoreStr = studentPageData.getString(testPaperPageData.getString("TESTPAPER_ID"));
if(getScoreStr != null){
try{
getScore += Integer.parseInt(getScoreStr);
}catch(Exception ex){
logger.info(ex);
}
}
}
studentPageData.put("TOTALSCORE", totalScore);
studentPageData.put("GETSCORE", getScore);
}
|
3a163205
孙向锦
报表优化
|
241
|
}*/
|
9338b563
孙向锦
添加报表
|
242
243
244
245
246
|
// 课程平均得分率
// 课程总分
mv.addObject("studentList", studentList);
info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
mv.addObject("info", info);
|
ffe4d02a
孙向锦
修改报表时间传递
|
247
248
|
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
eca4feb5
孙向锦
管理员功能完善
|
249
|
mv.addObject("pd", pd);
|
9338b563
孙向锦
添加报表
|
250
251
252
253
|
mv.setViewName("sunvote/teacher/teacher_report_1");
return mv;
}
|
3a163205
孙向锦
报表优化
|
254
255
256
257
258
259
260
261
262
|
private boolean contain(List<PageData> source, PageData aim,String key){
for(PageData tp : source){
if(tp.get(key) != null && tp.get(key).equals(aim.get(key))){
return true;
}
}
return false;
}
|
9338b563
孙向锦
添加报表
|
263
264
265
266
|
@RequestMapping(value="/teacher_report")
public ModelAndView teacher_report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"教师报表");
ModelAndView mv = this.getModelAndView();
|
ffe4d02a
孙向锦
修改报表时间传递
|
267
268
269
|
PageData pd = this.getPageData();
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
9338b563
孙向锦
添加报表
|
270
271
272
273
274
275
276
277
278
|
return mv;
}
@RequestMapping(value="/student_report")
public ModelAndView student_report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"学生成绩报表");
ModelAndView mv = this.getModelAndView();
PageData pd = getPageData();
|
b9dc59e6
孙向锦
管理员过滤条件
|
279
280
281
282
283
|
String url = "report/student_report_data?class_id=" +pd.getString("CLASS_ID");
if(pd.getString("SUBJECT_ID") != null){
url += "&SUBJECT_ID=" + pd.getString("SUBJECT_ID");
}
mv.addObject("URL",url);
|
4d39642d
孙向锦
添加学生报表
|
284
|
mv.setViewName("sunvote/teacher/stduent_report");
|
ffe4d02a
孙向锦
修改报表时间传递
|
285
286
|
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
90d4858f
孙向锦
修改管理员界面搜素功能
|
287
|
mv.addObject("pd", pd);
|
9338b563
孙向锦
添加报表
|
288
289
290
291
292
293
294
295
|
return mv;
}
@RequestMapping(value = "/student_report_data", produces = "application/json;charset=UTF-8")
@ResponseBody
public Object student_report_data() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"学生报表数据");
PageData pd = getPageData();
|
4d39642d
孙向锦
添加学生报表
|
296
|
ResponseGson<PageData> ret = new ResponseGson();
|
03a14c0e
孙向锦
更新报表
|
297
|
// pd.put("CLASS_ID", pd.get("CLASSID"));
|
9338b563
孙向锦
添加报表
|
298
|
List<PageData> studentList = studentService.listAllClass(pd);
|
b9dc59e6
孙向锦
管理员过滤条件
|
299
300
301
|
if ("teacher".equals(getRole())) {
pd.put("TEACHER_ID", getUserID());
}
|
9338b563
孙向锦
添加报表
|
302
|
List<PageData> testpaperList = testpaperService.listAll(pd);
|
4d39642d
孙向锦
添加学生报表
|
303
304
|
pd.put("ID", pd.get("CLASS_ID"));
PageData classPageData = sclassService.findById(pd);
|
066f7673
孙向锦
修复bug
|
305
306
|
float totalScore = 0 ;
float avgScore = 0;
|
9338b563
孙向锦
添加报表
|
307
308
309
310
|
for(PageData testPaperPageData:testpaperList){
String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
if(totalScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
311
|
totalScore += Float.parseFloat(totalScoreStr);
|
9338b563
孙向锦
添加报表
|
312
313
314
315
|
}catch(Exception ex){
logger.info(ex);
}
}
|
4d39642d
孙向锦
添加学生报表
|
316
317
318
|
String avgScoreStr = testPaperPageData.getString("AVG_SCORE");
if(avgScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
319
|
avgScore += Float.parseFloat(avgScoreStr);
|
4d39642d
孙向锦
添加学生报表
|
320
321
322
323
|
}catch(Exception ex){
logger.info(ex);
}
}
|
9338b563
孙向锦
添加报表
|
324
325
|
}
|
066f7673
孙向锦
修复bug
|
326
327
|
float allGetScore = 0;
float maxScore = 0 ;
|
9338b563
孙向锦
添加报表
|
328
329
330
331
332
333
334
335
336
337
338
|
// 查询学生名单及人数
if(studentList != null && studentList.size() > 0){
for(PageData studentPageData : studentList){
PageData search = new PageData();
search.put("STUDENT_ID", studentPageData.getString("ID"));
if(pd.containsKey("START_DATE")){
search.put("START_DATE", pd.getString("START_DATE"));
}
if(pd.containsKey("END_DATE")){
search.put("END_DATE", pd.getString("END_DATE"));
}
|
b9dc59e6
孙向锦
管理员过滤条件
|
339
340
341
342
343
344
|
if("teacher".equals(getRole())){
search.put("TEACHER_ID", getUserID());
}
if(pd.containsKey("SUBJECT_ID")){
search.put("SUBJECT_ID", pd.getString("SUBJECT_ID"));
}
|
9338b563
孙向锦
添加报表
|
345
346
347
|
List<PageData> studentTestList = studenttestService.reportListData(search);
studentPageData.put("testList", studentTestList);
|
066f7673
孙向锦
修复bug
|
348
|
float getScore = 0 ;
|
9338b563
孙向锦
添加报表
|
349
350
351
352
|
for(PageData studentTestPageData:studentTestList){
String getScoreStr = studentTestPageData.getString("SCORE");
if(getScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
353
|
getScore += Float.parseFloat(getScoreStr);
|
9338b563
孙向锦
添加报表
|
354
355
356
357
|
}catch(Exception ex){
logger.info(ex);
}
}
|
4d39642d
孙向锦
添加学生报表
|
358
359
360
|
studentTestPageData.getString("TEST_ID");
|
9338b563
孙向锦
添加报表
|
361
|
}
|
4d39642d
孙向锦
添加学生报表
|
362
|
// studentPageData.put("TOTALSCORE", totalScore);
|
9338b563
孙向锦
添加报表
|
363
364
365
366
367
368
369
370
371
|
studentPageData.put("GETSCORE", getScore);
studentPageData.remove("GROUPID");
studentPageData.remove("REMARK");
studentPageData.remove("PARENT_PHONE");
studentPageData.remove("PARENT_NAME");
studentPageData.remove("NUMBER");
studentPageData.remove("SIGN_NO");
studentPageData.remove("KEYPAD_ID");
studentPageData.remove("SNO");
|
4d39642d
孙向锦
添加学生报表
|
372
|
studentPageData.remove("SEX");
|
9338b563
孙向锦
添加报表
|
373
374
|
allGetScore += getScore;
|
4d39642d
孙向锦
添加学生报表
|
375
376
377
|
if(getScore > maxScore){
maxScore = getScore ;
}
|
9338b563
孙向锦
添加报表
|
378
379
380
|
}
}
|
4d39642d
孙向锦
添加学生报表
|
381
382
383
384
385
386
387
388
|
classPageData.remove("SCHOOL_ID");
classPageData.remove("GRADE_ID");
classPageData.remove("BASESTATION_ID");
classPageData.put("studentList", studentList);
classPageData.put("AVG_SCORE", avgScore);
classPageData.put("TOTAL_SCORE", totalScore);
classPageData.put("MAX_SCORE", maxScore);
ret.setData(classPageData);
|
9338b563
孙向锦
添加报表
|
389
390
391
392
393
394
|
return ret.toJson();
}
@RequestMapping(value="/test_report")
public ModelAndView paper_report() throws Exception{
|
9338b563
孙向锦
添加报表
|
395
|
ModelAndView mv = this.getModelAndView();
|
066f7673
孙向锦
修复bug
|
396
397
398
399
400
401
402
403
404
405
|
PageData pd = getPageData();
// 查询班级信息
pd.put("ID", pd.get("CLASS_ID"));
PageData classPageData = sclassService.findById(pd);
// 查询测试试卷信息
pd.put("TESTPAPER_ID", pd.get("TESTID"));
PageData testpaperPd = testpaperService.findById(pd);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
406
407
408
409
410
411
412
413
|
PageData teacherPd = new PageData();
teacherPd.put("ID", testpaperPd.get("TEACHER_ID"));
teacherPd = teacherService.findById(teacherPd);
PageData subjectPd = new PageData();
subjectPd.put("ID", testpaperPd.get("SUBJECT_ID"));
subjectPd = subjectService.findById(subjectPd);
|
3a163205
孙向锦
报表优化
|
414
415
|
pd.put("TEST_ID", pd.get("TESTID"));
List<PageData> detail = testpaperinfoService.reportTestPaperDetail(pd);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
416
|
|
3a163205
孙向锦
报表优化
|
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
|
List<PageData> studentList = new ArrayList();
// List<Integer> questionList = new ArrayList<Integer>();
PageData questionList = new PageData();
List<PageData> tqList = new ArrayList<PageData>();
PageData tmp = null;
float getScore = 0 ;
for(PageData tpd : detail){
if(tmp != null && tpd.get("ID").equals(tmp.get("ID"))){
try{
getScore += Float.parseFloat(tpd.getString("SCORE"));
}catch(Exception ex){};
tqList.add(tpd);
if(questionList.get(tpd.get("RANK")) != null){
if("1".equals(tpd.get("RIGHT"))){
Integer num = (Integer)questionList.get(tpd.get("RANK"));
questionList.put(tpd.get("RANK"), num+1);
}
}else{
if("1".equals(tpd.get("RIGHT"))){
questionList.put(tpd.get("RANK"), 1);
}else{
questionList.put(tpd.get("RANK"), 0);
}
}
}else{
if(tmp != null){
tmp.put("GETSCORE", getScore);
studentList.add(tmp);
}
getScore = 0 ;
tmp = new PageData();
tqList = new ArrayList<PageData>();
tmp.put("NAME", tpd.get("NAME"));
tmp.put("KEYPAD_ID", tpd.get("KEYPAD_ID"));
tmp.put("NUMBER", tpd.get("NUMBER"));
tmp.put("ID", tpd.get("ID"));
tqList.add(tpd);
tmp.put("detail", tqList);
try{
getScore += Float.parseFloat(tpd.getString("SCORE"));
}catch(Exception ex){};
if(questionList.get(tpd.get("RANK")) != null){
if("1".equals(tpd.get("RIGHT"))){
Integer num = (Integer)questionList.get(tpd.get("RANK"));
questionList.put(tpd.get("RANK"), num+1);
}
}else{
if("1".equals(tpd.get("RIGHT"))){
questionList.put(tpd.get("RANK"), 1);
}else{
questionList.put(tpd.get("RANK"), 0);
}
}
}
}
if(tmp != null){
tmp.put("GETSCORE", getScore);
studentList.add(tmp);
}
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
476
|
|
3a163205
孙向锦
报表优化
|
477
|
/*// 查询班级学生
|
066f7673
孙向锦
修复bug
|
478
479
480
481
482
483
484
485
486
|
List<PageData> studentList = studentService.listAllClass(pd);
List<Integer> questionList = new ArrayList<Integer>();
for(PageData studentPd : studentList){
// 查询答题情况
studentPd.put("TEST_ID", pd.getString("TESTID"));
studentPd.put("STUDENT_ID", studentPd.getString("ID"));
List<PageData> detail = testpaperinfoService.reportPaperDetail(studentPd);
studentPd.put("detail", detail);
|
ce1cff6c
孙向锦
报表
|
487
488
489
490
491
|
if(questionList.size() < 1){
for(int i = 0 ; i < detail.size(); i++){
questionList.add(0);
}
}
|
066f7673
孙向锦
修复bug
|
492
493
494
|
float score = 0 ;
for(int i = 0 ; i < detail.size(); i++){
PageData pad = detail.get(i);
|
ce1cff6c
孙向锦
报表
|
495
496
|
if ("1".equals(pad.getString("RIGHT"))) {
questionList.set(i, questionList.get(i) + 1);
|
066f7673
孙向锦
修复bug
|
497
|
}
|
066f7673
孙向锦
修复bug
|
498
499
500
501
502
503
504
505
506
507
|
String scoreStr = pad.getString("SCORE");
try{
score += Float.parseFloat(scoreStr);
}catch(Exception ex){
ex.printStackTrace();
}
}
studentPd.put("GETSCORE", score);
|
3a163205
孙向锦
报表优化
|
508
|
}*/
|
066f7673
孙向锦
修复bug
|
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
|
Collections.sort(studentList,new Comparator<PageData>(){
@Override
public int compare(PageData o1, PageData o2) {
String o1GetScore = o1.getString("GETSCORE");
String o2GetScore = o2.getString("GETSCORE");
float o1score = 0 ;
float o2score = 0 ;
try{
o1score = Float.parseFloat(o1GetScore);
}catch(Exception e){
o1score = -1 ;
}
try{
o2score = Float.parseFloat(o2GetScore);
}catch(Exception e){
o2score = -1 ;
}
|
d3d7b2ca
孙向锦
修改表格固定
|
529
530
531
532
|
if(o2score - o1score == 0){
String n1 = o1.getString("NUMBER");
String n2 = o2.getString("NUMBER");
if(n1 != null && n2 != null){
|
3a163205
孙向锦
报表优化
|
533
|
return Integer.parseInt(n1) - Integer.parseInt(n2);
|
d3d7b2ca
孙向锦
修改表格固定
|
534
535
|
}
}
|
066f7673
孙向锦
修复bug
|
536
537
538
539
|
return o2score - o1score > 0 ? 1 : -1;
}
});
|
f5451f32
孙向锦
分数相同,名词也相同
|
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
|
for(int i = 0 ; i < studentList.size(); i++){
PageData tpd1 = studentList.get(i);
if(i == 0){
tpd1.put("RANK_NUM", (i+1));
}else{
PageData tpd2 = studentList.get(i-1);
String o1GetScore = tpd1.getString("GETSCORE");
String o2GetScore = tpd2.getString("GETSCORE");
float o1score = 0 ;
float o2score = 0 ;
try{
o1score = Float.parseFloat(o1GetScore);
}catch(Exception e){
o1score = -1 ;
}
try{
o2score = Float.parseFloat(o2GetScore);
}catch(Exception e){
o2score = -1 ;
}
if(o2score - o1score == 0){
tpd1.put("RANK_NUM",tpd2.get("RANK_NUM"));
}else{
tpd1.put("RANK_NUM", (i+1));
}
}
}
|
066f7673
孙向锦
修复bug
|
567
568
|
classPageData.put("studentNum", studentList.size());
|
3a163205
孙向锦
报表优化
|
569
570
571
572
573
574
575
|
if("teacher".equals(getRole())){
mv.addObject("display", false);
}else{
mv.addObject("display", true);
}
|
066f7673
孙向锦
修复bug
|
576
577
578
579
|
mv.addObject("classInfo", classPageData);
mv.addObject("testpaperInfo", testpaperPd);
mv.addObject("questionInfo", questionList);
mv.addObject("studentInfo", studentList);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
580
581
|
mv.addObject("teacherPd", teacherPd);
mv.addObject("subjectPd", subjectPd);
|
4d39642d
孙向锦
添加学生报表
|
582
583
|
mv.setViewName("sunvote/teacher/teacher_report_test");
|
9338b563
孙向锦
添加报表
|
584
585
586
587
|
return mv;
}
}
|