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>();
|
eca4feb5
孙向锦
管理员功能完善
|
73
74
75
76
|
mv.addObject("subjectInfos", subjectInfos);
}else{
pd.put("TEACHER_ID", getUserID());
}
|
9338b563
孙向锦
添加报表
|
77
78
79
80
81
82
83
|
// 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
孙向锦
添加报表
|
84
|
// 2查询班级考试
|
ddbc622f
孙向锦
0829版本
|
85
|
pd.put("TEST_TYPE", "1");
|
3a163205
孙向锦
报表优化
|
86
87
88
89
90
|
// modify 根據班級查詢班級報表
List<PageData> reportData = v1Service.classReport(pd);
List<PageData> testpaperList = new ArrayList();
List<PageData> studentList = new ArrayList();
PageData studentPd = null;
|
3f6c3003
孙向锦
更新计算方式
|
91
92
|
double totalScore = 0 ;
double getScore = 0 ;
|
3a163205
孙向锦
报表优化
|
93
94
95
96
97
98
99
100
101
102
103
104
105
106
|
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
孙向锦
更新计算方式
|
107
|
totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
108
109
110
111
112
113
|
}catch(Exception ex){
logger.info(ex);
}
}
if(score != null){
try{
|
3f6c3003
孙向锦
更新计算方式
|
114
|
getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
|
}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
孙向锦
更新计算方式
|
139
|
totalScore = new BigDecimal(totalScoreStr).add(new BigDecimal(Double.toString(totalScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
140
141
142
143
144
145
|
}catch(Exception ex){
logger.info(ex);
}
}
if(score != null){
try{
|
3f6c3003
孙向锦
更新计算方式
|
146
|
getScore = new BigDecimal(score).add(new BigDecimal(Double.toString(getScore))).doubleValue();
|
3a163205
孙向锦
报表优化
|
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
|
}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
孙向锦
添加报表
|
181
182
|
mv.addObject("testpaperList", testpaperList);
info.put("testsize", testpaperList != null ? testpaperList.size() : 0);
|
3a163205
孙向锦
报表优化
|
183
|
|
9338b563
孙向锦
添加报表
|
184
185
186
|
mv.addObject("studentList", studentList);
info.put("STUDENT_NUM", studentList != null ? studentList.size() : 0);
mv.addObject("info", info);
|
ffe4d02a
孙向锦
修改报表时间传递
|
187
188
|
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
eca4feb5
孙向锦
管理员功能完善
|
189
|
mv.addObject("pd", pd);
|
fd0087a8
孙向锦
添加英语语言
|
190
191
192
193
194
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/teacher/teacher_report_1");
}else{
mv.setViewName("sunvote/teacher/en_teacher_report_1");
}
|
9338b563
孙向锦
添加报表
|
195
196
197
|
return mv;
}
|
3a163205
孙向锦
报表优化
|
198
199
200
201
202
203
204
205
206
|
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
孙向锦
添加报表
|
207
208
209
210
|
@RequestMapping(value="/teacher_report")
public ModelAndView teacher_report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"教师报表");
ModelAndView mv = this.getModelAndView();
|
ffe4d02a
孙向锦
修改报表时间传递
|
211
212
213
|
PageData pd = this.getPageData();
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
9338b563
孙向锦
添加报表
|
214
215
216
217
218
219
220
221
222
|
return mv;
}
@RequestMapping(value="/student_report")
public ModelAndView student_report() throws Exception{
logBefore(logger, Jurisdiction.getUsername()+"学生成绩报表");
ModelAndView mv = this.getModelAndView();
PageData pd = getPageData();
|
b9dc59e6
孙向锦
管理员过滤条件
|
223
224
225
226
227
|
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
孙向锦
添加英语语言
|
228
229
230
231
232
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/teacher/stduent_report");
}else{
mv.setViewName("sunvote/teacher/en_stduent_report");
}
|
ffe4d02a
孙向锦
修改报表时间传递
|
233
234
|
mv.addObject("start_date", pd.get("START_DATE"));
mv.addObject("end_date", pd.get("END_DATE"));
|
90d4858f
孙向锦
修改管理员界面搜素功能
|
235
|
mv.addObject("pd", pd);
|
9338b563
孙向锦
添加报表
|
236
237
238
239
240
241
242
243
|
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
孙向锦
添加学生报表
|
244
|
ResponseGson<PageData> ret = new ResponseGson();
|
b9dc59e6
孙向锦
管理员过滤条件
|
245
246
247
|
if ("teacher".equals(getRole())) {
pd.put("TEACHER_ID", getUserID());
}
|
e9f47f90
孙向锦
优化个人成绩报表
|
248
249
250
251
252
253
254
255
256
257
258
259
260
261
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
|
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
孙向锦
添加学生报表
|
306
307
|
pd.put("ID", pd.get("CLASS_ID"));
PageData classPageData = sclassService.findById(pd);
|
066f7673
孙向锦
修复bug
|
308
309
|
float totalScore = 0 ;
float avgScore = 0;
|
e9f47f90
孙向锦
优化个人成绩报表
|
310
|
for(PageData testPaperPageData:studentTestList){
|
9338b563
孙向锦
添加报表
|
311
312
313
|
String totalScoreStr = testPaperPageData.getString("TOTAL_SCORE");
if(totalScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
314
|
totalScore += Float.parseFloat(totalScoreStr);
|
9338b563
孙向锦
添加报表
|
315
316
317
318
|
}catch(Exception ex){
logger.info(ex);
}
}
|
4d39642d
孙向锦
添加学生报表
|
319
320
321
|
String avgScoreStr = testPaperPageData.getString("AVG_SCORE");
if(avgScoreStr != null){
try{
|
066f7673
孙向锦
修复bug
|
322
|
avgScore += Float.parseFloat(avgScoreStr);
|
4d39642d
孙向锦
添加学生报表
|
323
324
325
326
|
}catch(Exception ex){
logger.info(ex);
}
}
|
9338b563
孙向锦
添加报表
|
327
328
|
}
|
e9f47f90
孙向锦
优化个人成绩报表
|
329
|
|
4d39642d
孙向锦
添加学生报表
|
330
331
332
333
334
335
336
337
|
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
孙向锦
添加报表
|
338
339
340
341
342
343
|
return ret.toJson();
}
@RequestMapping(value="/test_report")
public ModelAndView paper_report() throws Exception{
|
9338b563
孙向锦
添加报表
|
344
|
ModelAndView mv = this.getModelAndView();
|
066f7673
孙向锦
修复bug
|
345
346
347
348
349
350
351
352
353
354
|
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
孙向锦
报表添加教师名称及科目信息
|
355
356
357
358
359
360
361
362
|
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
孙向锦
报表优化
|
363
364
|
pd.put("TEST_ID", pd.get("TESTID"));
List<PageData> detail = testpaperinfoService.reportTestPaperDetail(pd);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
365
|
|
3a163205
孙向锦
报表优化
|
366
367
368
369
370
371
372
373
374
375
376
377
378
379
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
|
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
孙向锦
报表添加教师名称及科目信息
|
425
|
|
3a163205
孙向锦
报表优化
|
426
|
/*// 查询班级学生
|
066f7673
孙向锦
修复bug
|
427
428
429
430
431
432
433
434
435
|
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
孙向锦
报表
|
436
437
438
439
440
|
if(questionList.size() < 1){
for(int i = 0 ; i < detail.size(); i++){
questionList.add(0);
}
}
|
066f7673
孙向锦
修复bug
|
441
442
443
|
float score = 0 ;
for(int i = 0 ; i < detail.size(); i++){
PageData pad = detail.get(i);
|
ce1cff6c
孙向锦
报表
|
444
445
|
if ("1".equals(pad.getString("RIGHT"))) {
questionList.set(i, questionList.get(i) + 1);
|
066f7673
孙向锦
修复bug
|
446
|
}
|
066f7673
孙向锦
修复bug
|
447
448
449
450
451
452
453
454
455
456
|
String scoreStr = pad.getString("SCORE");
try{
score += Float.parseFloat(scoreStr);
}catch(Exception ex){
ex.printStackTrace();
}
}
studentPd.put("GETSCORE", score);
|
3a163205
孙向锦
报表优化
|
457
|
}*/
|
066f7673
孙向锦
修复bug
|
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
|
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
孙向锦
修改表格固定
|
478
479
480
481
|
if(o2score - o1score == 0){
String n1 = o1.getString("NUMBER");
String n2 = o2.getString("NUMBER");
if(n1 != null && n2 != null){
|
3a163205
孙向锦
报表优化
|
482
|
return Integer.parseInt(n1) - Integer.parseInt(n2);
|
d3d7b2ca
孙向锦
修改表格固定
|
483
484
|
}
}
|
066f7673
孙向锦
修复bug
|
485
486
487
488
|
return o2score - o1score > 0 ? 1 : -1;
}
});
|
f5451f32
孙向锦
分数相同,名词也相同
|
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
|
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
|
516
517
|
classPageData.put("studentNum", studentList.size());
|
3a163205
孙向锦
报表优化
|
518
519
520
521
522
523
524
|
if("teacher".equals(getRole())){
mv.addObject("display", false);
}else{
mv.addObject("display", true);
}
|
066f7673
孙向锦
修复bug
|
525
526
527
528
|
mv.addObject("classInfo", classPageData);
mv.addObject("testpaperInfo", testpaperPd);
mv.addObject("questionInfo", questionList);
mv.addObject("studentInfo", studentList);
|
705eb8ca
孙向锦
报表添加教师名称及科目信息
|
529
530
|
mv.addObject("teacherPd", teacherPd);
mv.addObject("subjectPd", subjectPd);
|
fd0087a8
孙向锦
添加英语语言
|
531
532
533
534
535
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/teacher/teacher_report_test");
}else{
mv.setViewName("sunvote/teacher/en_teacher_report_test");
}
|
9338b563
孙向锦
添加报表
|
536
537
538
539
|
return mv;
}
}
|