9338b563
孙向锦
添加报表
|
1
2
|
package com.fh.controller.sunvote.report;
|
3f6c3003
孙向锦
更新计算方式
|
3
|
import java.math.BigDecimal;
|
066f7673
孙向锦
修复bug
|
4
5
6
|
import java.util.ArrayList;
import java.util.Collections;
import java.util.Comparator;
|
9338b563
孙向锦
添加报表
|
7
8
9
10
11
12
13
14
15
16
17
|
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
孙向锦
管理员功能完善
|
18
|
import com.fh.service.api.V1Manager;
|
9338b563
孙向锦
添加报表
|
19
20
21
|
import com.fh.service.sunvote.sclass.SClassManager;
import com.fh.service.sunvote.student.StudentManager;
import com.fh.service.sunvote.studenttest.StudentTestManager;
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
22
23
|
import com.fh.service.sunvote.subject.SubjectManager;
import com.fh.service.sunvote.teacher.TeacherManager;
|
9338b563
孙向锦
添加报表
|
24
|
import com.fh.service.sunvote.testpaper.TestPaperManager;
|
066f7673
孙向锦
修复bug
|
25
|
import com.fh.service.sunvote.testpaperinfo.TestPaperInfoManager;
|
9338b563
孙向锦
添加报表
|
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
|
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
|
45
46
47
|
@Resource(name="testpaperinfoService")
private TestPaperInfoManager testpaperinfoService;
|
eca4feb5
孙向锦
管理员功能完善
|
48
49
50
|
@Resource(name = "v1Service")
private V1Manager v1Service;
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
51
52
53
54
55
56
|
@Resource(name = "teacherService")
private TeacherManager teacherService;
@Resource(name="subjectService")
private SubjectManager subjectService;
|
9338b563
孙向锦
添加报表
|
57
58
59
60
61
62
63
64
65
|
@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
孙向锦
样例报表
|
66
|
pd.put("TEST_TYPE", "1");
|
eca4feb5
孙向锦
管理员功能完善
|
67
68
69
70
|
String role = pd.getString("ROLE");
if( role != null && "admin".equals(role)){
PageData tpd = new PageData();
tpd.put("ID", getUserID());
|
a479f295
孙向锦
添加了报表逻辑
|
71
|
PageData adminInfos = v1Service.getAdminInfo(tpd);
|
eca4feb5
孙向锦
管理员功能完善
|
72
|
List<PageData> subjectInfos = new ArrayList<PageData>();
|
a479f295
孙向锦
添加了报表逻辑
|
73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
// 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);
// }
// }
|
eca4feb5
孙向锦
管理员功能完善
|
87
88
89
90
|
mv.addObject("subjectInfos", subjectInfos);
}else{
pd.put("TEACHER_ID", getUserID());
}
|
9338b563
孙向锦
添加报表
|
91
92
93
94
95
96
97
|
// 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"));
|
9338b563
孙向锦
添加报表
|
98
|
// 2查询班级考试
|
ddbc622f
孙向锦
0829版本
|
99
|
pd.put("TEST_TYPE", "1");
|
3a163205
孙向锦
报表优化
|
100
101
102
103
104
|
// modify 根據班級查詢班級報表
List<PageData> reportData = v1Service.classReport(pd);
List<PageData> testpaperList = new ArrayList();
List<PageData> studentList = new ArrayList();
PageData studentPd = null;
|
3f6c3003
孙向锦
更新计算方式
|
105
106
|
double totalScore = 0 ;
double getScore = 0 ;
|
3a163205
孙向锦
报表优化
|
107
108
109
110
111
112
113
114
115
116
117
118
119
120
|
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{
|
3f6c3003
孙向锦
更新计算方式
|
121
|
totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
122
123
124
125
126
127
|
}catch(Exception ex){
logger.info(ex);
}
}
if(score != null){
try{
|
3f6c3003
孙向锦
更新计算方式
|
128
|
getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
|
}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{
|
3f6c3003
孙向锦
更新计算方式
|
153
|
totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
154
155
156
157
158
159
|
}catch(Exception ex){
logger.info(ex);
}
}
if(score != null){
try{
|
3f6c3003
孙向锦
更新计算方式
|
160
|
getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
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
|
}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
孙向锦
添加报表
|
195
196
|
mv.addObject("testpaperList", testpaperList);
info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
|
3a163205
孙向锦
报表优化
|
197
|
|
9338b563
孙向锦
添加报表
|
198
199
200
|
mv.addObject("studentList", studentList);
info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
mv.addObject("info", info);
|
ffe4d02a
孙向锦
修改报表时间传递
|
201
202
|
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
eca4feb5
孙向锦
管理员功能完善
|
203
|
mv.addObject("pd", pd);
|
fd0087a8
孙向锦
添加英语语言
|
204
205
206
207
208
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/teacher/teacher_report_1");
}else{
mv.setViewName("sunvote/teacher/en_teacher_report_1");
}
|
9338b563
孙向锦
添加报表
|
209
210
211
|
return mv;
}
|
3a163205
孙向锦
报表优化
|
212
213
214
215
216
217
218
219
220
|
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
孙向锦
添加报表
|
221
222
223
224
|
@RequestMapping(value="/teacher_report")
public ModelAndView teacher_report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"教师报表");
ModelAndView mv = this.getModelAndView();
|
ffe4d02a
孙向锦
修改报表时间传递
|
225
226
227
|
PageData pd = this.getPageData();
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
9338b563
孙向锦
添加报表
|
228
229
230
231
232
233
234
235
236
|
return mv;
}
@RequestMapping(value="/student_report")
public ModelAndView student_report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"学生成绩报表");
ModelAndView mv = this.getModelAndView();
PageData pd = getPageData();
|
b9dc59e6
孙向锦
管理员过滤条件
|
237
238
239
240
241
|
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);
|
fd0087a8
孙向锦
添加英语语言
|
242
243
244
245
246
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/teacher/stduent_report");
}else{
mv.setViewName("sunvote/teacher/en_stduent_report");
}
|
ffe4d02a
孙向锦
修改报表时间传递
|
247
248
|
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
90d4858f
孙向锦
修改管理员界面搜素功能
|
249
|
mv.addObject("pd", pd);
|
9338b563
孙向锦
添加报表
|
250
251
252
253
254
255
256
257
|
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
孙向锦
添加学生报表
|
258
|
ResponseGson<PageData> ret = new ResponseGson();
|
b9dc59e6
孙向锦
管理员过滤条件
|
259
260
261
|
if ("teacher".equals(getRole())) {
pd.put("TEACHER_ID", getUserID());
}
|
e9f47f90
孙向锦
优化个人成绩报表
|
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
|
pd.put("TEST_TYPE", "1");
List<PageData> dataList = studenttestService.reportClassListData(pd);
List<PageData> studentList = new ArrayList();
List<PageData> studentTestList = new ArrayList();
PageData studentPd = null;
float getScore = 0f ;
float allGetScore = 0;
float maxScore = 0 ;
for(PageData tmp : dataList){
if(studentPd != null && tmp.get("ID").equals(studentPd.get("ID"))){
String getScoreStr = tmp.getString("SCORE");
float score = 0 ;
if(getScoreStr != null){
try{
score = Float.parseFloat(getScoreStr);
}catch(Exception ex){
logger.info(ex);
}
}
getScore += score;
allGetScore += score;
tmp.put("NAME", tmp.get("TNAME"));
studentTestList.add(tmp);
}else{
if(studentPd != null){
if(getScore > maxScore){
maxScore = getScore ;
}
studentPd.put("GETSCORE", getScore);
studentPd.put("testList", studentTestList);
studentList.add(studentPd);
}
studentPd = new PageData();
studentTestList = new ArrayList();
getScore = 0 ;
String getScoreStr = tmp.getString("SCORE");
float score = 0 ;
if(getScoreStr != null){
try{
score = Float.parseFloat(getScoreStr);
}catch(Exception ex){
logger.info(ex);
}
}
getScore += score;
allGetScore += score;
studentPd.put("NAME", tmp.get("NAME"));
studentPd.put("ID", tmp.get("ID"));
tmp.put("NAME", tmp.get("TNAME"));
studentTestList.add(tmp);
}
}
if(studentPd != null){
studentPd.put("GETSCORE", getScore);
studentPd.put("testList", studentTestList);
studentList.add(studentPd);
}
|
4d39642d
孙向锦
添加学生报表
|
320
321
|
pd.put("ID", pd.get("CLASS_ID"));
PageData classPageData = sclassService.findById(pd);
|
066f7673
孙向锦
修复bug
|
322
323
|
float totalScore = 0 ;
float avgScore = 0;
|
e9f47f90
孙向锦
优化个人成绩报表
|
324
|
for(PageData testPaperPageData:studentTestList){
|
9338b563
孙向锦
添加报表
|
325
326
327
|
String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
if(totalScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
328
|
totalScore += Float.parseFloat(totalScoreStr);
|
9338b563
孙向锦
添加报表
|
329
330
331
332
|
}catch(Exception ex){
logger.info(ex);
}
}
|
4d39642d
孙向锦
添加学生报表
|
333
334
335
|
String avgScoreStr = testPaperPageData.getString("AVG_SCORE");
if(avgScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
336
|
avgScore += Float.parseFloat(avgScoreStr);
|
4d39642d
孙向锦
添加学生报表
|
337
338
339
340
|
}catch(Exception ex){
logger.info(ex);
}
}
|
9338b563
孙向锦
添加报表
|
341
342
|
}
|
e9f47f90
孙向锦
优化个人成绩报表
|
343
|
|
4d39642d
孙向锦
添加学生报表
|
344
345
346
347
348
349
350
351
|
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
孙向锦
添加报表
|
352
353
354
355
356
357
|
return ret.toJson();
}
@RequestMapping(value="/test_report")
public ModelAndView paper_report() throws Exception{
|
9338b563
孙向锦
添加报表
|
358
|
ModelAndView mv = this.getModelAndView();
|
066f7673
孙向锦
修复bug
|
359
360
361
362
363
364
365
366
367
368
|
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
孙向锦
报表添加教师名称及科目信息
|
369
370
371
372
373
374
375
376
|
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
孙向锦
报表优化
|
377
378
|
pd.put("TEST_ID", pd.get("TESTID"));
List<PageData> detail = testpaperinfoService.reportTestPaperDetail(pd);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
379
|
|
3a163205
孙向锦
报表优化
|
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
|
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
孙向锦
报表添加教师名称及科目信息
|
439
|
|
3a163205
孙向锦
报表优化
|
440
|
/*// 查询班级学生
|
066f7673
孙向锦
修复bug
|
441
442
443
444
445
446
447
448
449
|
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
孙向锦
报表
|
450
451
452
453
454
|
if(questionList.size() < 1){
for(int i = 0 ; i < detail.size(); i++){
questionList.add(0);
}
}
|
066f7673
孙向锦
修复bug
|
455
456
457
|
float score = 0 ;
for(int i = 0 ; i < detail.size(); i++){
PageData pad = detail.get(i);
|
ce1cff6c
孙向锦
报表
|
458
459
|
if ("1".equals(pad.getString("RIGHT"))) {
questionList.set(i, questionList.get(i) + 1);
|
066f7673
孙向锦
修复bug
|
460
|
}
|
066f7673
孙向锦
修复bug
|
461
462
463
464
465
466
467
468
469
470
|
String scoreStr = pad.getString("SCORE");
try{
score += Float.parseFloat(scoreStr);
}catch(Exception ex){
ex.printStackTrace();
}
}
studentPd.put("GETSCORE", score);
|
3a163205
孙向锦
报表优化
|
471
|
}*/
|
066f7673
孙向锦
修复bug
|
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
|
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
孙向锦
修改表格固定
|
492
493
494
495
|
if(o2score - o1score == 0){
String n1 = o1.getString("NUMBER");
String n2 = o2.getString("NUMBER");
if(n1 != null && n2 != null){
|
3a163205
孙向锦
报表优化
|
496
|
return Integer.parseInt(n1) - Integer.parseInt(n2);
|
d3d7b2ca
孙向锦
修改表格固定
|
497
498
|
}
}
|
066f7673
孙向锦
修复bug
|
499
500
501
502
|
return o2score - o1score > 0 ? 1 : -1;
}
});
|
f5451f32
孙向锦
分数相同,名词也相同
|
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
|
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
|
530
531
|
classPageData.put("studentNum", studentList.size());
|
3a163205
孙向锦
报表优化
|
532
533
534
535
536
537
538
|
if("teacher".equals(getRole())){
mv.addObject("display", false);
}else{
mv.addObject("display", true);
}
|
066f7673
孙向锦
修复bug
|
539
540
541
542
|
mv.addObject("classInfo", classPageData);
mv.addObject("testpaperInfo", testpaperPd);
mv.addObject("questionInfo", questionList);
mv.addObject("studentInfo", studentList);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
543
544
|
mv.addObject("teacherPd", teacherPd);
mv.addObject("subjectPd", subjectPd);
|
fd0087a8
孙向锦
添加英语语言
|
545
546
547
548
549
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/teacher/teacher_report_test");
}else{
mv.setViewName("sunvote/teacher/en_teacher_report_test");
}
|
9338b563
孙向锦
添加报表
|
550
551
552
553
|
return mv;
}
}
|