be2f84a1
孙向锦
添加课后作业基础模块数据
|
1
2
3
4
5
6
|
package com.fh.controller.sunvote.homework;
import java.io.PrintWriter;
import java.text.DateFormat;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
|
6dd8580c
孙向锦
修改报表数据
|
7
|
import java.util.Calendar;
|
a764d288
孙向锦
修改课后练bug
|
8
9
|
import java.util.Collections;
import java.util.Comparator;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
10
11
12
13
|
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
|
a479f295
孙向锦
添加了报表逻辑
|
14
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
15
|
import javax.annotation.Resource;
|
a479f295
孙向锦
添加了报表逻辑
|
16
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
17
18
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.stereotype.Controller;
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
19
|
import org.springframework.util.StringUtils;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
20
21
22
23
24
|
import org.springframework.web.bind.WebDataBinder;
import org.springframework.web.bind.annotation.InitBinder;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.ModelAndView;
|
a479f295
孙向锦
添加了报表逻辑
|
25
|
|
5162dcee
孙向锦
添加上传作业接口
|
26
27
28
|
import com.fh.bean.HomeClass;
import com.fh.bean.Homework;
import com.fh.bean.HomeworkQuestion;
|
2514d928
孙向锦
添加课后作ye,API
|
29
|
import com.fh.controller.api.ResponseGson;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
30
31
|
import com.fh.controller.base.BaseController;
import com.fh.entity.Page;
|
fcd1fe57
孙向锦
报表数据
|
32
|
import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
|
a479f295
孙向锦
添加了报表逻辑
|
33
34
|
import com.fh.service.sunvote.homework.HomeworkManager;
import com.fh.service.sunvote.homework.HomeworkReportManager;
|
5162dcee
孙向锦
添加上传作业接口
|
35
|
import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
|
68056c63
孙向锦
添加学生人数
|
36
|
import com.fh.service.sunvote.student.StudentManager;
|
b3c44d84
孙向锦
课后练bug修复
|
37
38
|
import com.fh.service.sunvote.teacher.TeacherManager;
import com.fh.service.sunvote.teacher.impl.TeacherService;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
39
|
import com.fh.util.AppUtil;
|
a479f295
孙向锦
添加了报表逻辑
|
40
|
import com.fh.util.Jurisdiction;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
41
42
|
import com.fh.util.ObjectExcelView;
import com.fh.util.PageData;
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
43
|
import com.fh.util.StringUtil;
|
a479f295
孙向锦
添加了报表逻辑
|
44
|
import com.google.gson.Gson;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
45
|
|
a479f295
孙向锦
添加了报表逻辑
|
46
47
|
/**
* 说明:作业 创建人:FH Q313596790 创建时间:2019-03-07
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
48
49
|
*/
@Controller
|
a479f295
孙向锦
添加了报表逻辑
|
50
|
@RequestMapping(value = "/homework")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
51
|
public class HomeworkController extends BaseController {
|
a479f295
孙向锦
添加了报表逻辑
|
52
53
54
|
String menuUrl = "homework/list.do"; // 菜单地址(权限用)
@Resource(name = "homeworkService")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
55
|
private HomeworkManager homeworkService;
|
a479f295
孙向锦
添加了报表逻辑
|
56
57
|
@Resource(name = "homeworkReporService")
private HomeworkReportManager homeworkReporService;
|
02c4ed52
孙向锦
更新上传作业接口
|
58
59
|
@Resource(name = "homeworkproblemService")
|
5162dcee
孙向锦
添加上传作业接口
|
60
|
private HomeworkProblemManager homeworkproblemService;
|
fcd1fe57
孙向锦
报表数据
|
61
62
63
64
65
66
|
@Resource(name="coursemanagementService")
private CourseManagementManager coursemanagementService;
@Resource(name="homeworkReporService")
private HomeworkReportManager homeworkReporkService;
|
68056c63
孙向锦
添加学生人数
|
67
68
69
|
@Resource(name="studentService")
private StudentManager studentService;
|
b3c44d84
孙向锦
课后练bug修复
|
70
71
72
|
@Resource(name = "teacherService")
private TeacherManager teacherService;
|
a479f295
孙向锦
添加了报表逻辑
|
73
74
75
76
|
/**
* 保存
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
77
78
79
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
80
81
82
|
@RequestMapping(value = "/save")
public ModelAndView save() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "新增Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
83
84
85
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
86
|
pd.put("HOMEWORK_ID", this.get32UUID()); // 主键
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
87
|
homeworkService.save(pd);
|
a479f295
孙向锦
添加了报表逻辑
|
88
|
mv.addObject("msg", "success");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
89
90
91
|
mv.setViewName("save_result");
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
92
93
94
95
|
/**
* 删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
96
97
98
|
* @param out
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
99
100
101
|
@RequestMapping(value = "/delete")
public void delete(PrintWriter out) throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "删除Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
102
103
104
105
106
107
|
PageData pd = new PageData();
pd = this.getPageData();
homeworkService.delete(pd);
out.write("success");
out.close();
}
|
a479f295
孙向锦
添加了报表逻辑
|
108
109
110
111
|
/**
* 修改
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
112
113
114
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
115
116
|
@RequestMapping(value = "/edit")
public ModelAndView edit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
117
118
119
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
120
|
|
a479f295
孙向锦
添加了报表逻辑
|
121
|
mv.addObject("msg", "success");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
122
123
124
|
mv.setViewName("save_result");
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
125
126
127
128
|
/**
* 列表
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
129
130
131
|
* @param page
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
132
133
134
|
@RequestMapping(value = "/list")
public ModelAndView list(Page page) throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
135
136
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
|
b3c44d84
孙向锦
课后练bug修复
|
137
138
|
pd = this.getPageData();
if(pd.get("SCHOOL_ID") == null){
|
91de7adc
孙向锦
添加管理员页面
|
139
140
|
pd.put("TEACHER_ID", getTeacherID());
}
|
a479f295
孙向锦
添加了报表逻辑
|
141
142
|
String keywords = pd.getString("keywords"); // 关键词检索条件
if (null != keywords && !"".equals(keywords)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
143
144
145
|
pd.put("keywords", keywords.trim());
}
page.setPd(pd);
|
1ee08611
jack
1.英文翻译(2)
|
146
|
page.setLangIsChina(isChineseLanguageClient());
|
a479f295
孙向锦
添加了报表逻辑
|
147
|
List<PageData> varList = homeworkService.list(page); // 列出Homework列表
|
1ee08611
jack
1.英文翻译(2)
|
148
149
150
151
152
153
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_list");
}else{
mv.setViewName("sunvote/homework/en_homework_list");
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
154
155
|
mv.addObject("varList", varList);
mv.addObject("pd", pd);
|
a479f295
孙向锦
添加了报表逻辑
|
156
|
mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
157
158
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
159
160
161
162
|
/**
* 去新增页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
163
164
165
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
166
167
|
@RequestMapping(value = "/goAdd")
public ModelAndView goAdd() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
168
169
170
171
172
173
174
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
mv.setViewName("sunvote/homework/homework_edit");
mv.addObject("msg", "save");
mv.addObject("pd", pd);
return mv;
|
a479f295
孙向锦
添加了报表逻辑
|
175
|
}
|
2c6bc93d
孙向锦
更新作业
|
176
|
|
85ea5817
孙向锦
布置练习更新
|
177
178
179
180
181
182
183
184
185
186
187
|
/**
* 去新增页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goAdd2")
public ModelAndView goAdd2() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
5b1fa3bc
孙向锦
修复bug
|
188
189
190
|
// 添加科目ID
pd.put("TEACHER_ID", getTeacherID());
pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
|
1ee08611
jack
1.英文翻译(2)
|
191
192
193
194
195
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_edit2");
}else{
mv.setViewName("sunvote/homework/en_homework_edit2");
}
|
85ea5817
孙向锦
布置练习更新
|
196
|
mv.addObject("msg", "save");
|
8952fd04
孙向锦
添加浏览功能
|
197
|
mv.addObject("operation", "add");
|
85ea5817
孙向锦
布置练习更新
|
198
199
200
|
mv.addObject("pd", pd);
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
201
|
|
5b1fa3bc
孙向锦
修复bug
|
202
|
/**
|
a479f295
孙向锦
添加了报表逻辑
|
203
204
|
* 去修改页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
205
206
207
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
208
209
|
@RequestMapping(value = "/goEdit")
public ModelAndView goEdit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
210
211
212
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
213
|
pd = homeworkService.findById(pd); // 根据ID读取
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
214
215
216
217
|
mv.setViewName("sunvote/homework/homework_edit");
mv.addObject("msg", "edit");
mv.addObject("pd", pd);
return mv;
|
a479f295
孙向锦
添加了报表逻辑
|
218
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
219
|
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
220
221
222
223
224
225
226
227
228
229
230
231
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goEdit2")
public ModelAndView goEdit2() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
pd = homeworkService.findById(pd); // 根据ID读取
|
85ea5817
孙向锦
布置练习更新
|
232
|
pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
|
fcd1fe57
孙向锦
报表数据
|
233
|
pd.put("TEACHER_ID", getTeacherID());
|
1ee08611
jack
1.英文翻译(2)
|
234
235
236
237
238
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_edit2");
}else{
mv.setViewName("sunvote/homework/en_homework_edit2");
}
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
239
|
mv.addObject("msg", "edit");
|
8952fd04
孙向锦
添加浏览功能
|
240
241
242
243
244
245
|
mv.addObject("operation", "edit");
mv.addObject("pd", pd);
return mv;
}
/**
|
892c3766
=
1、增加练习报表页面
|
246
|
* 去预览页面
|
8952fd04
孙向锦
添加浏览功能
|
247
248
249
250
251
252
253
254
255
256
257
|
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goView")
public ModelAndView goView() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
pd = homeworkService.findById(pd); // 根据ID读取
pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
|
fcd1fe57
孙向锦
报表数据
|
258
|
pd.put("TEACHER_ID", getTeacherID());
|
1ee08611
jack
1.英文翻译(2)
|
259
260
261
262
263
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_view");
}else{
mv.setViewName("sunvote/homework/en_homework_view");
}
|
8952fd04
孙向锦
添加浏览功能
|
264
265
|
mv.addObject("msg", "edit");
mv.addObject("operation", "view");
|
892c3766
=
1、增加练习报表页面
|
266
267
268
|
mv.addObject("pd", pd);
return mv;
}
|
94ab1e18
孙向锦
删除重复的action
|
269
|
|
a28085c0
孙向锦
修改班级编辑bug
|
270
|
|
6dd8580c
孙向锦
修改报表数据
|
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
|
public static String getWeekStart(int cur){
SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd");
Calendar ca = Calendar.getInstance();
ca.setFirstDayOfWeek(Calendar.MONDAY);
int a = ca.getFirstDayOfWeek();
ca.set(Calendar.DAY_OF_WEEK, a); // Sunday
ca.add(Calendar.DATE, cur * 7);
String weekEnd = format.format(ca.getTime());
return weekEnd;
}
public static String getWeekEnd(int cur){
SimpleDateFormat format = new SimpleDateFormat("YYYY-MM-dd");
Calendar ca = Calendar.getInstance();
ca.setFirstDayOfWeek(Calendar.MONDAY);
int a = ca.getFirstDayOfWeek();
ca.set(Calendar.DAY_OF_WEEK, a+6); // Sunday
ca.add(Calendar.DATE, cur * 7);
String weekEnd = format.format(ca.getTime());
return weekEnd + " 23:59:59";
}
|
a28085c0
孙向锦
修改班级编辑bug
|
293
294
|
/**
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
|
* 传入homework_id
* 查询该场课后练的整体情况,最高分,最低分,平均分,总分,总题数,未答人数等
* 未答人数列表
* @return
* @throws Exception
*/
@RequestMapping(value = "/report2")
public ModelAndView report2() throws Exception {
PageData pageData = this.getPageData();
ModelAndView modelAndView = getModelAndView();
String homeworkId = pageData.getString("HOMEWORK_ID");
if(!StringUtils.isEmpty(homeworkId.trim())){
pageData = homeworkService.findById(pageData);
List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
pageData.put("NO_COUNT", data.size());
|
d7348237
jack
1.修改课后练报表页面
|
311
|
modelAndView.addObject("page_data", pageData); // 报表统计情况
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
312
313
314
315
|
modelAndView.addObject("data", data);// 未答学生列表
}
if(isChineseLanguageClient()){
|
d7348237
jack
1.修改课后练报表页面
|
316
|
modelAndView.setViewName("sunvote/homework/homework_report");
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
317
|
}else{
|
d7348237
jack
1.修改课后练报表页面
|
318
|
modelAndView.setViewName("sunvote/homework/en_homework_report");
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
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
425
426
427
428
429
430
|
}
return modelAndView;
}
/**
* 传入homework_id
* index 第几题
* @return
* @throws Exception
*/
@RequestMapping(value = "/homeworkindexview")
public ModelAndView homeworkindexview() throws Exception {
PageData pageData = this.getPageData();
ModelAndView modelAndView = getModelAndView();
String homeworkId = pageData.getString("HOMEWORK_ID");
String index = pageData.getString("INDEX");
int indexint = Integer.parseInt(index);
List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
List<PageData> result = new ArrayList();
PageData aresult = new PageData();
aresult.put("ANSWER", "A");
PageData bresult = new PageData();
bresult.put("ANSWER", "B");
PageData cresult = new PageData();
cresult.put("ANSWER", "C");
PageData dresult = new PageData();
dresult.put("ANSWER", "D");
PageData eresult = new PageData();
eresult.put("ANSWER", "");
result.add(aresult);
result.add(bresult);
result.add(cresult);
result.add(dresult);
result.add(eresult);
for(PageData pd : data){
String answer = pd.getString("ANSWER");
if(!StringUtils.isEmpty(answer)){
String[] answers = answer.split(";");
if(answers.length >= indexint -1){
String ans = answers[indexint - 1];
String[] anss = ans.split(":");
if(anss != null && anss.length == 2){
PageData tresult = null;
for(PageData ptd : result){
if(anss[0].toUpperCase().equals(anss[0].toUpperCase())){
tresult = ptd;
}
}
if(tresult == null){
tresult = new PageData();
result.add(tresult);
}
List<String> list = (List)tresult.get("STUDENTS");
if(list == null){
list = new ArrayList();
}
list.add(pd.getString("STUDENT_NAME"));
tresult.put("ANSWER", anss[0].toUpperCase());
tresult.put("STUDENTS", list);
tresult.put("RIGHT", !"0".equals(anss[1]));
}
}
}
}
modelAndView.addObject("datas", new Gson().toJson(result));
// modelAndView.addObject("datas",result);
modelAndView.setViewName("");
return modelAndView;
}
/**
* 传入homework_id
* index 第几题
* @return
* @throws Exception
*/
@RequestMapping(value = "/homeworkindex")
@ResponseBody
public Object homeworkindex() throws Exception {
PageData pageData = this.getPageData();
String homeworkId = pageData.getString("HOMEWORK_ID");
String index = pageData.getString("INDEX");
int indexint = Integer.parseInt(index);
List<PageData> data = homeworkReporkService.findNoAnswerByHomeworkID(pageData);
List<PageData> result = new ArrayList();
PageData aresult = new PageData();
aresult.put("ANSWER", "A");
PageData bresult = new PageData();
bresult.put("ANSWER", "B");
PageData cresult = new PageData();
cresult.put("ANSWER", "C");
PageData dresult = new PageData();
dresult.put("ANSWER", "D");
PageData eresult = new PageData();
eresult.put("ANSWER", "");
result.add(aresult);
result.add(bresult);
result.add(cresult);
result.add(dresult);
result.add(eresult);
for(PageData pd : data){
String answer = pd.getString("ANSWER");
if(!StringUtils.isEmpty(answer)){
String[] answers = answer.split(";");
if(answers.length >= indexint -1){
String ans = answers[indexint - 1];
|
d7348237
jack
1.修改课后练报表页面
|
431
|
String[] anss = ans.split(",");
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
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
|
if(anss != null && anss.length == 2){
PageData tresult = null;
for(PageData ptd : result){
if(anss[0].toUpperCase().equals(anss[0].toUpperCase())){
tresult = ptd;
}
}
if(tresult == null){
tresult = new PageData();
result.add(tresult);
}
List<String> list = (List)tresult.get("STUDENTS");
if(list == null){
list = new ArrayList();
}
list.add(pd.getString("STUDENT_NAME"));
tresult.put("ANSWER", anss[0].toUpperCase());
tresult.put("STUDENTS", list);
tresult.put("RIGHT", !"0".equals(anss[1]));
}
}
}
}
return new Gson().toJson(result);
}
/**
|
a28085c0
孙向锦
修改班级编辑bug
|
462
463
464
465
466
467
468
469
470
471
|
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/report")
public ModelAndView report() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
b3c44d84
孙向锦
课后练bug修复
|
472
473
474
|
if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){
pd.put("TEACHER_ID", getTeacherID());
}
|
6dd8580c
孙向锦
修改报表数据
|
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
|
if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
pd.put("CURRENT_WEEK", "0");
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}else if(pd.get("CURRENT_WEEK") != null){
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}
// 班级信息
|
fcd1fe57
孙向锦
报表数据
|
491
|
List<PageData> list = coursemanagementService.listTeacherClass(pd);
|
6dd8580c
孙向锦
修改报表数据
|
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
|
for(PageData temp : list){
temp.remove("HEADMASTER_ID");
temp.remove("SCHOOL_ID");
temp.remove("GRADE_ID");
temp.remove("TEACHER_ID");
temp.remove("KEYBOARD_TYPE");
temp.remove("BASESTATION_ID");
temp.put("CLASS_ID", temp.get("ID"));
temp.remove("ID");
}
if(pd.get("CLASS_ID") == null && list.size() > 0){
pd.put("CLASS_ID", list.get(0).get("CLASS_ID"));
}
pd.put("CLASSES", list);
|
41bc74d2
孙向锦
添加空判断
|
507
508
509
510
|
if (pd.get("CLASS_ID") != null) {
// 对应班级数据
PageData data = new PageData();
List<PageData> studentList = studentService.findByClassId(pd);
|
0a4dfe03
孙向锦
修改报表数据不应该出现的bug
|
511
|
pd.put("COMPLETE_COUNT", "1");
|
41bc74d2
孙向锦
添加空判断
|
512
513
514
515
516
|
List<PageData> homeworkList = homeworkService.listAll(pd);
List<PageData> dataList = homeworkService.report(pd);
for (PageData stuPd : studentList) {
double all = 0;
double get = 0;
|
1cbf6605
孙向锦
作业报表更新
|
517
518
|
int sc = 0 ;
int ac = 0 ;
|
41bc74d2
孙向锦
添加空判断
|
519
|
for (PageData dpd : dataList) {
|
a2414076
孙向锦
修改谢曲提交过来的bug
|
520
|
if (stuPd.get("ID") != null && dpd.get("STUDENT_ID") != null && dpd.get("STUDENT_ID").equals(stuPd.get("ID")) && isIn(dpd.getString("HOMEWORK_ID"),homeworkList)) {
|
41bc74d2
孙向锦
添加空判断
|
521
522
523
524
525
526
527
528
529
530
531
532
533
534
|
stuPd.put(dpd.get("HOMEWORK_ID"),
dpd.get("STUDENT_SCORE"));
try {
get += Double.parseDouble(dpd.get("STUDENT_SCORE")
.toString());
} catch (Exception ex) {
}
try {
all += Double.parseDouble(dpd.get("PAPER_SCORE")
.toString());
} catch (Exception ex) {
}
|
1cbf6605
孙向锦
作业报表更新
|
535
536
537
538
539
540
541
542
543
544
545
546
547
|
try {
sc += Integer.parseInt(dpd.get("COMPLETE_COUNT")
.toString());
} catch (Exception ex) {
}
try {
ac += Integer.parseInt(dpd.get("QUESTION_COUNT")
.toString());
} catch (Exception ex) {
}
|
76263c7c
孙向锦
添加报表百分比数据
|
548
|
}
|
6dd8580c
孙向锦
修改报表数据
|
549
|
}
|
41bc74d2
孙向锦
添加空判断
|
550
551
|
stuPd.put("STUDENT_ALL_SCORE", get);
stuPd.put("PAPER_ALL_SCORE", all);
|
1cbf6605
孙向锦
作业报表更新
|
552
553
|
stuPd.put("COMPLETE_COUNT", sc);
stuPd.put("ALL_COUNT", ac);
|
41bc74d2
孙向锦
添加空判断
|
554
555
556
557
|
stuPd.remove("SCHOOL_ID");
stuPd.remove("SEX");
stuPd.remove("CLASS_ID");
stuPd.remove("NUMBER");
|
22e695bf
孙向锦
添加学生ID传送
|
558
|
stuPd.put("STUDENT_ID", stuPd.get("ID"));
|
41bc74d2
孙向锦
添加空判断
|
559
|
stuPd.remove("ID");
|
bd553929
孙向锦
修改接口
|
560
|
}
|
a764d288
孙向锦
修改课后练bug
|
561
|
|
41bc74d2
孙向锦
添加空判断
|
562
563
564
565
566
567
568
569
570
571
572
573
574
575
|
for (PageData hpd : homeworkList) {
hpd.remove("QUESTION_COUNT");
hpd.remove("COMPLETE_COUNT");
hpd.remove("SUBJECT_ID");
hpd.remove("SCHOOL_ID");
hpd.remove("GRADE_ID");
hpd.remove("SUMBIT_DATE");
hpd.remove("MODIFY_DATE");
hpd.remove("TEACHER_ID");
hpd.remove("CREATE_DATE");
hpd.remove("CLASS_ID");
hpd.remove("CODE");
hpd.remove("GET_MAX_SCORE");
hpd.remove("HOMEWORK_DESC");
|
41bc74d2
孙向锦
添加空判断
|
576
577
578
579
580
581
|
}
data.put("HOMEWORKS", homeworkList);//
data.put("STUDENTS", studentList);
pd.put("DATA", data);
}else{
pd.put("CLASS_ID", "");
|
fcd1fe57
孙向锦
报表数据
|
582
|
}
|
76263c7c
孙向锦
添加报表百分比数据
|
583
|
pd.remove("JSON");
|
1ee08611
jack
1.英文翻译(2)
|
584
585
586
587
588
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_report");
}else{
mv.setViewName("sunvote/homework/en_homework_report");
}
|
a28085c0
孙向锦
修改班级编辑bug
|
589
590
591
|
mv.addObject("pd", pd);
return mv;
}
|
4431f0b7
孙向锦
报表页面
|
592
593
|
|
a2414076
孙向锦
修改谢曲提交过来的bug
|
594
595
596
597
598
599
600
601
602
603
604
|
private boolean isIn(String homeworkId,List<PageData> data){
if(data != null && homeworkId != null){
for(PageData pd : data){
if(homeworkId.equals(pd.get("HOMEWORK_ID"))){
return true;
}
}
}
return false;
}
|
4431f0b7
孙向锦
报表页面
|
605
606
607
608
609
610
611
612
613
614
615
616
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/student")
public ModelAndView student() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
pd.put("TEACHER_ID", getTeacherID());
|
4431f0b7
孙向锦
报表页面
|
617
618
619
620
621
622
623
624
625
626
627
628
|
if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
pd.put("CURRENT_WEEK", "0");
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}else if(pd.get("CURRENT_WEEK") != null){
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}
|
6a210cdd
孙向锦
添加数据
|
629
|
String studentId = pd.getString("STUDENT_ID") ;
|
40af1dd5
jack
1、修改学生报表界面(2)
|
630
|
//pd.remove("STUDENT_ID");
|
6a210cdd
孙向锦
添加数据
|
631
632
|
List<PageData> dataList = homeworkService.report(pd);
pd.put("DATA", dataList);
|
80838e9c
孙向锦
修改时间不能使用的bug
|
633
634
635
636
|
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
|
4431f0b7
孙向锦
报表页面
|
637
|
pd.remove("JSON");
|
6a210cdd
孙向锦
添加数据
|
638
|
pd.put("STUDENT_ID", studentId);
|
1ee08611
jack
1.英文翻译(2)
|
639
640
641
642
643
644
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_student_report");
}else{
mv.setViewName("sunvote/homework/en_homework_student_report");
}
|
4431f0b7
孙向锦
报表页面
|
645
|
mv.addObject("pd", pd);
|
6a210cdd
孙向锦
添加数据
|
646
647
|
Gson gson = new Gson();
mv.addObject("data",gson.toJson(pd));
|
4431f0b7
孙向锦
报表页面
|
648
649
650
|
return mv;
}
|
6a210cdd
孙向锦
添加数据
|
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/student_data", produces = "application/json;charset=UTF-8")
@ResponseBody
public String studentData() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
pd.put("TEACHER_ID", getTeacherID());
if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
pd.put("CURRENT_WEEK", "0");
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}else if(pd.get("CURRENT_WEEK") != null){
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}
String studentId = pd.getString("STUDENT_ID") ;
pd.remove("STUDENT_ID");
List<PageData> dataList = homeworkService.report(pd);
pd.put("DATA", dataList);
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
pd.remove("JSON");
pd.put("STUDENT_ID", studentId);
Gson gson = new Gson();
return gson.toJson(pd);
}
|
4431f0b7
孙向锦
报表页面
|
689
690
691
692
693
694
695
696
697
698
699
700
701
702
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/homework_report")
public ModelAndView homework_report() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
pd.put("TEACHER_ID", getTeacherID());
|
4431f0b7
孙向锦
报表页面
|
703
704
705
706
707
708
709
710
711
712
713
714
|
if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
pd.put("CURRENT_WEEK", "0");
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}else if(pd.get("CURRENT_WEEK") != null){
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}
|
80838e9c
孙向锦
修改时间不能使用的bug
|
715
716
|
if(pd.get("HOMEWORK_ID") != null){
List<PageData> dataList = homeworkService.report(pd);
|
a764d288
孙向锦
修改课后练bug
|
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
|
Collections.sort(dataList,new Comparator<PageData>(){
@Override
public int compare(PageData o1, PageData o2) {
String o1GetScore = o1.getString("STUDENT_SCORE");
String o2GetScore = o2.getString("STUDENT_SCORE");
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 ;
}
return o1score - o2score > 0 ? -1 : 1;
}
});
for(int i = 0 ; i < dataList.size(); i++){
PageData tpd1 = dataList.get(i);
if(i == 0){
tpd1.put("RANK", (i+1));
}else{
PageData tpd2 = dataList.get(i-1);
String o1GetScore = tpd1.getString("STUDENT_SCORE");
String o2GetScore = tpd2.getString("STUDENT_SCORE");
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",tpd2.get("RANK"));
}else{
tpd1.put("RANK", (i+1));
}
}
}
|
80838e9c
孙向锦
修改时间不能使用的bug
|
766
767
768
769
770
771
772
|
pd.put("DATA", dataList);
}
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
|
c93a7724
孙向锦
添加试卷描述
|
773
774
|
pd.put("HOMEWORKINFO", homeworkService.findById(pd));
|
4431f0b7
孙向锦
报表页面
|
775
776
777
778
779
|
pd.remove("JSON");
mv.setViewName("sunvote/homework/homework_item_report");
mv.addObject("pd", pd);
return mv;
}
|
6a210cdd
孙向锦
添加数据
|
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
|
@RequestMapping(value = "/homework_report_data" , produces = "application/json;charset=UTF-8")
@ResponseBody
public String homeworkReportData() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
pd.put("TEACHER_ID", getTeacherID());
if(pd.get("CURRENT_WEEK") == null && pd.get("START_DATE") == null && pd.get("END_DATE") == null){
pd.put("CURRENT_WEEK", "0");
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}else if(pd.get("CURRENT_WEEK") != null){
String currentWeek = pd.getString("CURRENT_WEEK");
int current = Integer.parseInt(currentWeek);
pd.put("START_DATE", getWeekStart(current));
pd.put("END_DATE", getWeekEnd(current));
}
if(pd.get("HOMEWORK_ID") != null){
List<PageData> dataList = homeworkService.report(pd);
pd.put("DATA", dataList);
}
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
pd.remove("JSON");
Gson gson = new Gson();
return gson.toJson(pd);
}
|
4431f0b7
孙向锦
报表页面
|
815
|
|
a28085c0
孙向锦
修改班级编辑bug
|
816
|
|
a479f295
孙向锦
添加了报表逻辑
|
817
818
819
820
|
/**
* 批量删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
821
822
823
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
824
|
@RequestMapping(value = "/deleteAll")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
825
|
@ResponseBody
|
a479f295
孙向锦
添加了报表逻辑
|
826
827
|
public Object deleteAll() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
|
a479f295
孙向锦
添加了报表逻辑
|
828
829
|
PageData pd = new PageData();
Map<String, Object> map = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
830
831
832
|
pd = this.getPageData();
List<PageData> pdList = new ArrayList<PageData>();
String DATA_IDS = pd.getString("DATA_IDS");
|
a479f295
孙向锦
添加了报表逻辑
|
833
|
if (null != DATA_IDS && !"".equals(DATA_IDS)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
834
|
String ArrayDATA_IDS[] = DATA_IDS.split(",");
|
015d5970
孙向锦
更新删除接口
|
835
|
homeworkService.deleteHomeworkAll(ArrayDATA_IDS);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
836
|
pd.put("msg", "ok");
|
a479f295
孙向锦
添加了报表逻辑
|
837
|
} else {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
838
839
840
841
842
843
|
pd.put("msg", "no");
}
pdList.add(pd);
map.put("list", pdList);
return AppUtil.returnObject(pd, map);
}
|
a479f295
孙向锦
添加了报表逻辑
|
844
845
846
847
|
/**
* 导出到excel
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
848
849
850
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
851
852
853
854
855
856
|
@RequestMapping(value = "/excel")
public ModelAndView exportExcel() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "导出Homework到excel");
if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
return null;
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
857
858
859
|
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
860
|
Map<String, Object> dataMap = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
861
|
List<String> titles = new ArrayList<String>();
|
a479f295
孙向锦
添加了报表逻辑
|
862
863
864
865
866
867
868
869
870
871
872
|
titles.add("作业代码"); // 1
titles.add("作业名称"); // 2
titles.add("科目ID"); // 3
titles.add("班级ID"); // 4
titles.add("年级ID"); // 5
titles.add("学校ID"); // 6
titles.add("需要完成时间"); // 7
titles.add("创建时间"); // 8
titles.add("修改时间"); // 9
titles.add("完成次数"); // 10
titles.add("总分"); // 11
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
873
874
875
|
dataMap.put("titles", titles);
List<PageData> varOList = homeworkService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
|
a479f295
孙向锦
添加了报表逻辑
|
876
|
for (int i = 0; i < varOList.size(); i++) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
877
|
PageData vpd = new PageData();
|
a479f295
孙向锦
添加了报表逻辑
|
878
879
880
881
882
883
884
885
886
887
888
|
vpd.put("var1", varOList.get(i).getString("CODE")); // 1
vpd.put("var2", varOList.get(i).getString("NAME")); // 2
vpd.put("var3", varOList.get(i).getString("SUBJECT_ID")); // 3
vpd.put("var4", varOList.get(i).getString("CLASS_ID")); // 4
vpd.put("var5", varOList.get(i).getString("GRADE_ID")); // 5
vpd.put("var6", varOList.get(i).getString("SCHOOL_ID")); // 6
vpd.put("var7", varOList.get(i).getString("COMPLETE_DATE")); // 7
vpd.put("var8", varOList.get(i).getString("CREATE_DATE")); // 8
vpd.put("var9", varOList.get(i).getString("MODIFY_DATE")); // 9
vpd.put("var10", varOList.get(i).get("COMPLETE_COUNT").toString()); // 10
vpd.put("var11", varOList.get(i).get("ALL_SCORE").toString()); // 11
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
889
890
891
892
|
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
|
a479f295
孙向锦
添加了报表逻辑
|
893
|
mv = new ModelAndView(erv, dataMap);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
894
895
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
896
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
897
|
@InitBinder
|
a479f295
孙向锦
添加了报表逻辑
|
898
|
public void initBinder(WebDataBinder binder) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
899
|
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
a479f295
孙向锦
添加了报表逻辑
|
900
901
902
903
904
905
906
907
908
909
910
911
912
913
|
binder.registerCustomEditor(Date.class, new CustomDateEditor(format,
true));
}
/**
* 批量删除
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/homereport", produces = "application/json;charset=UTF-8")
@ResponseBody
public String getHomeReport() throws Exception {
PageData pd = this.getPageData();
|
a28085c0
孙向锦
修改班级编辑bug
|
914
915
916
917
918
919
920
921
922
923
924
|
if(pd.get("HOMEWORK_ID") != null && !"".equals(pd.get("HOMEWORK_ID").toString().trim())){
pd = homeworkService.findById(pd);
if(pd != null){
List<PageData> data = homeworkReporService.findByHomeworkID(pd);
pd.put("STUDENTS", data);
}else{
pd.put("HOMEWORK_ID", "no");
}
}else{
pd.put("HOMEWORK_ID", "no data");
}
|
a479f295
孙向锦
添加了报表逻辑
|
925
926
|
Gson gson = new Gson();
return gson.toJson(pd);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
927
|
}
|
a28085c0
孙向锦
修改班级编辑bug
|
928
929
|
|
5162dcee
孙向锦
添加上传作业接口
|
930
|
|
2514d928
孙向锦
添加课后作ye,API
|
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
|
/**
* 列表
*
* @param page
* @throws Exception
*/
@RequestMapping(value = "/listdata", produces = "application/json;charset=UTF-8")
@ResponseBody
public String listdata(Page page) throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
String keywords = pd.getString("keywords"); // 关键词检索条件
if (null != keywords && !"".equals(keywords)) {
pd.put("keywords", keywords.trim());
}
page.setPd(pd);
List<PageData> varList = homeworkService.list(page); // 列出Homework列表
Gson gson = new Gson();
return gson.toJson(varList);
}
|
5162dcee
孙向锦
添加上传作业接口
|
951
952
953
|
@RequestMapping(value = "/savedata", produces = "application/json;charset=UTF-8")
@ResponseBody
|
2514d928
孙向锦
添加课后作ye,API
|
954
955
956
|
public String savedata() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
|
5162dcee
孙向锦
添加上传作业接口
|
957
|
pd.put("HOMEWORK_ID", this.get32UUID());
|
0786f023
孙向锦
修改教师不能删除的bug
|
958
|
pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
|
2514d928
孙向锦
添加课后作ye,API
|
959
960
961
962
963
|
homeworkService.save(pd);
ResponseGson<String> responseGson = new ResponseGson<String>();
responseGson.setData(pd.getString("HOMEWORK_ID"));
return responseGson.toJson();
}
|
02c4ed52
孙向锦
更新上传作业接口
|
964
|
|
5162dcee
孙向锦
添加上传作业接口
|
965
966
967
968
969
970
971
972
|
@RequestMapping(value = "/uploadHomework", produces = "application/json;charset=UTF-8")
@ResponseBody
public String uploadHomework() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String data = pd.getJsonString();
ResponseGson<String> responseGson = new ResponseGson<String>();
|
02c4ed52
孙向锦
更新上传作业接口
|
973
|
|
5162dcee
孙向锦
添加上传作业接口
|
974
|
Homework homework = Homework.parse(data);
|
02c4ed52
孙向锦
更新上传作业接口
|
975
|
|
b3c44d84
孙向锦
课后练bug修复
|
976
977
978
|
pd.put("ID", getTeacherID());
PageData tmpd = teacherService.findById(pd);
|
5162dcee
孙向锦
添加上传作业接口
|
979
|
PageData hpd = new PageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
980
981
982
|
if (homework != null) {
hpd.put("CODE", get32UUID());
hpd.put("NAME", homework.getNAME());
|
5b1fa3bc
孙向锦
修复bug
|
983
|
if(homework.getSUBJECT_ID() == null){
|
0786f023
孙向锦
修改教师不能删除的bug
|
984
|
pd.put("TEACHER_ID", homework.getTEACHER_ID());
|
5b1fa3bc
孙向锦
修复bug
|
985
986
987
988
989
|
List<PageData> slist = homeworkService.querySubjectId(pd);
if(slist.size() > 0){
homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
}
}
|
02c4ed52
孙向锦
更新上传作业接口
|
990
991
992
993
994
995
996
997
|
hpd.put("SUBJECT_ID", homework.getSUBJECT_ID());
hpd.put("ALL_SCORE", homework.getALL_SCORE());
hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC());
hpd.put("QUESTION_COUNT", homework.getQUESTION_COUNT());
hpd.put("CREATE_DATE", format.format(new Date()));
hpd.put("MODIFY_DATE", format.format(new Date()));
hpd.put("COMPLETE_COUNT", 0);
hpd.put("TEACHER_ID", homework.getTEACHER_ID());
|
b3c44d84
孙向锦
课后练bug修复
|
998
|
hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
|
02c4ed52
孙向锦
更新上传作业接口
|
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
1014
1015
1016
1017
1018
1019
1020
1021
1022
1023
1024
1025
1026
|
hpd.put("COMPLETE_DESC", "");
if (homework.getCLASSLIST() != null
&& homework.getCLASSLIST().size() > 0
&& homework.getQUESTIONS() != null
&& homework.getQUESTIONS().size() > 0) {
for (HomeClass homeclass : homework.getCLASSLIST()) {
hpd.put("CLASS_ID", homeclass.getCLASS_ID());
hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE());
hpd.put("HOMEWORK_ID", this.get32UUID());
homeworkService.save(hpd);
}
for (HomeworkQuestion homeworkQuestion : homework
.getQUESTIONS()) {
PageData qpd = new PageData();
qpd.put("RANK", homeworkQuestion.getRANK());
qpd.put("CODE", hpd.get("CODE"));
qpd.put("NAME", homeworkQuestion.getNAME());
qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM());
qpd.put("SCORE", homeworkQuestion.getSCORE());
qpd.put("RIGHT_ANSWER", homeworkQuestion.getRIGHT_ANSWER());
qpd.put("TYPE", homeworkQuestion.getTYPE());
qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID());
qpd.put("HOMEWORK_ID", hpd.get("CODE"));
homeworkproblemService.save(qpd);
}
|
85ea5817
孙向锦
布置练习更新
|
1027
|
responseGson.setData(hpd.getString("CODE"));
|
02c4ed52
孙向锦
更新上传作业接口
|
1028
1029
1030
1031
1032
|
} else {
responseGson.setDataError();
}
} else {
responseGson.setDataError();
|
5162dcee
孙向锦
添加上传作业接口
|
1033
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
1034
1035
|
return responseGson.toJson();
}
|
2c6bc93d
孙向锦
更新作业
|
1036
1037
1038
1039
1040
1041
1042
1043
1044
1045
1046
|
@RequestMapping(value = "/updateHomework", produces = "application/json;charset=UTF-8")
@ResponseBody
public String updateHomework() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
String data = pd.getJsonString();
ResponseGson<String> responseGson = new ResponseGson<String>();
Homework homework = Homework.parse(data);
|
b3c44d84
孙向锦
课后练bug修复
|
1047
1048
|
pd.put("ID", getTeacherID());
PageData tmpd = teacherService.findById(pd);
|
2c6bc93d
孙向锦
更新作业
|
1049
1050
1051
1052
1053
1054
1055
1056
1057
1058
1059
1060
1061
1062
1063
1064
1065
|
PageData hpd = new PageData();
if (homework != null) {
if (homework.getHOMEWORK_ID() != null
&& !"".equals(homework.getHOMEWORK_ID().trim())) {
hpd.put("HOMEWORK_ID", homework.getHOMEWORK_ID());
hpd = homeworkService.findById(hpd);
if(hpd != null){
hpd.put("NAME", homework.getNAME());
hpd.put("SUBJECT_ID", homework.getSUBJECT_ID());
hpd.put("ALL_SCORE", homework.getALL_SCORE());
hpd.put("HOMEWORK_DESC", homework.getHOMEWORK_DESC());
hpd.put("QUESTION_COUNT", homework.getQUESTION_COUNT());
hpd.put("CREATE_DATE", format.format(new Date()));
hpd.put("MODIFY_DATE", format.format(new Date()));
hpd.put("COMPLETE_COUNT", 0);
hpd.put("TEACHER_ID", homework.getTEACHER_ID());
hpd.put("COMPLETE_DESC", "");
|
b3c44d84
孙向锦
课后练bug修复
|
1066
|
hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
|
2c6bc93d
孙向锦
更新作业
|
1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088
1089
1090
1091
1092
1093
1094
1095
1096
1097
1098
1099
1100
1101
1102
1103
1104
1105
1106
1107
1108
1109
1110
1111
1112
1113
1114
1115
1116
1117
1118
1119
1120
1121
1122
1123
1124
|
if(homeworkService.findByCode(hpd).size() > 1){
hpd.put("CODE", get32UUID());
for (HomeClass homeclass : homework.getCLASSLIST()) {
hpd.put("CLASS_ID", homeclass.getCLASS_ID());
hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE());
homeworkService.edit(hpd);
}
for (HomeworkQuestion homeworkQuestion : homework
.getQUESTIONS()) {
PageData qpd = new PageData();
qpd.put("RANK", homeworkQuestion.getRANK());
qpd.put("CODE", hpd.get("CODE"));
qpd.put("NAME", homeworkQuestion.getNAME());
qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM());
qpd.put("SCORE", homeworkQuestion.getSCORE());
qpd.put("RIGHT_ANSWER",
homeworkQuestion.getRIGHT_ANSWER());
qpd.put("TYPE", homeworkQuestion.getTYPE());
qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID());
qpd.put("HOMEWORK_ID", hpd.get("CODE"));
homeworkproblemService.save(qpd);
}
responseGson.setData(hpd.getString("CODE"));
}else{
for (HomeClass homeclass : homework.getCLASSLIST()) {
hpd.put("CLASS_ID", homeclass.getCLASS_ID());
hpd.put("COMPLETE_DATE", homeclass.getCOMPLETE_DATE());
homeworkService.edit(hpd);
}
homeworkproblemService.deleteByCode(hpd);
for (HomeworkQuestion homeworkQuestion : homework
.getQUESTIONS()) {
PageData qpd = new PageData();
qpd.put("RANK", homeworkQuestion.getRANK());
qpd.put("CODE", hpd.get("CODE"));
qpd.put("NAME", homeworkQuestion.getNAME());
qpd.put("OPTION_NUM", homeworkQuestion.getOPTION_NUM());
qpd.put("SCORE", homeworkQuestion.getSCORE());
qpd.put("RIGHT_ANSWER",
homeworkQuestion.getRIGHT_ANSWER());
qpd.put("TYPE", homeworkQuestion.getTYPE());
qpd.put("HOMEWORKPROBLEM_ID", this.get32UUID());
qpd.put("HOMEWORK_ID", hpd.get("CODE"));
homeworkproblemService.save(qpd);
}
responseGson.setData(hpd.getString("CODE"));
}
}else{
responseGson.setDataError();
}
} else {
responseGson.setDataError();
}
} else {
responseGson.setDataError();
}
return responseGson.toJson();
}
|
f7e4dd61
孙向锦
根据客户UI的需求进行修改
|
1125
1126
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
1127
|
}
|