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
19
20
21
22
23
|
import org.springframework.beans.propertyeditors.CustomDateEditor;
import org.springframework.stereotype.Controller;
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
孙向锦
添加了报表逻辑
|
24
|
|
5162dcee
孙向锦
添加上传作业接口
|
25
26
27
|
import com.fh.bean.HomeClass;
import com.fh.bean.Homework;
import com.fh.bean.HomeworkQuestion;
|
2514d928
孙向锦
添加课后作ye,API
|
28
|
import com.fh.controller.api.ResponseGson;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
29
30
|
import com.fh.controller.base.BaseController;
import com.fh.entity.Page;
|
fcd1fe57
孙向锦
报表数据
|
31
|
import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
|
a479f295
孙向锦
添加了报表逻辑
|
32
33
|
import com.fh.service.sunvote.homework.HomeworkManager;
import com.fh.service.sunvote.homework.HomeworkReportManager;
|
5162dcee
孙向锦
添加上传作业接口
|
34
|
import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
|
68056c63
孙向锦
添加学生人数
|
35
|
import com.fh.service.sunvote.student.StudentManager;
|
b3c44d84
孙向锦
课后练bug修复
|
36
37
|
import com.fh.service.sunvote.teacher.TeacherManager;
import com.fh.service.sunvote.teacher.impl.TeacherService;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
38
|
import com.fh.util.AppUtil;
|
a479f295
孙向锦
添加了报表逻辑
|
39
|
import com.fh.util.Jurisdiction;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
40
41
|
import com.fh.util.ObjectExcelView;
import com.fh.util.PageData;
|
a479f295
孙向锦
添加了报表逻辑
|
42
|
import com.google.gson.Gson;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
43
|
|
a479f295
孙向锦
添加了报表逻辑
|
44
45
|
/**
* 说明:作业 创建人:FH Q313596790 创建时间:2019-03-07
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
46
47
|
*/
@Controller
|
a479f295
孙向锦
添加了报表逻辑
|
48
|
@RequestMapping(value = "/homework")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
49
|
public class HomeworkController extends BaseController {
|
a479f295
孙向锦
添加了报表逻辑
|
50
51
52
|
String menuUrl = "homework/list.do"; // 菜单地址(权限用)
@Resource(name = "homeworkService")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
53
|
private HomeworkManager homeworkService;
|
a479f295
孙向锦
添加了报表逻辑
|
54
55
|
@Resource(name = "homeworkReporService")
private HomeworkReportManager homeworkReporService;
|
02c4ed52
孙向锦
更新上传作业接口
|
56
57
|
@Resource(name = "homeworkproblemService")
|
5162dcee
孙向锦
添加上传作业接口
|
58
|
private HomeworkProblemManager homeworkproblemService;
|
fcd1fe57
孙向锦
报表数据
|
59
60
61
62
63
64
|
@Resource(name="coursemanagementService")
private CourseManagementManager coursemanagementService;
@Resource(name="homeworkReporService")
private HomeworkReportManager homeworkReporkService;
|
68056c63
孙向锦
添加学生人数
|
65
66
67
|
@Resource(name="studentService")
private StudentManager studentService;
|
b3c44d84
孙向锦
课后练bug修复
|
68
69
70
|
@Resource(name = "teacherService")
private TeacherManager teacherService;
|
a479f295
孙向锦
添加了报表逻辑
|
71
72
73
74
|
/**
* 保存
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
75
76
77
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
78
79
80
|
@RequestMapping(value = "/save")
public ModelAndView save() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "新增Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
81
82
83
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
84
|
pd.put("HOMEWORK_ID", this.get32UUID()); // 主键
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
85
|
homeworkService.save(pd);
|
a479f295
孙向锦
添加了报表逻辑
|
86
|
mv.addObject("msg", "success");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
87
88
89
|
mv.setViewName("save_result");
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
90
91
92
93
|
/**
* 删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
94
95
96
|
* @param out
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
97
98
99
|
@RequestMapping(value = "/delete")
public void delete(PrintWriter out) throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "删除Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
100
101
102
103
104
105
|
PageData pd = new PageData();
pd = this.getPageData();
homeworkService.delete(pd);
out.write("success");
out.close();
}
|
a479f295
孙向锦
添加了报表逻辑
|
106
107
108
109
|
/**
* 修改
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
110
111
112
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
113
114
|
@RequestMapping(value = "/edit")
public ModelAndView edit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
115
116
117
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
118
|
|
a479f295
孙向锦
添加了报表逻辑
|
119
|
mv.addObject("msg", "success");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
120
121
122
|
mv.setViewName("save_result");
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
123
124
125
126
|
/**
* 列表
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
127
128
129
|
* @param page
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
130
131
132
|
@RequestMapping(value = "/list")
public ModelAndView list(Page page) throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
133
134
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
|
b3c44d84
孙向锦
课后练bug修复
|
135
136
|
pd = this.getPageData();
if(pd.get("SCHOOL_ID") == null){
|
91de7adc
孙向锦
添加管理员页面
|
137
138
|
pd.put("TEACHER_ID", getTeacherID());
}
|
a479f295
孙向锦
添加了报表逻辑
|
139
140
|
String keywords = pd.getString("keywords"); // 关键词检索条件
if (null != keywords && !"".equals(keywords)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
141
142
143
|
pd.put("keywords", keywords.trim());
}
page.setPd(pd);
|
1ee08611
jack
1.英文翻译(2)
|
144
|
page.setLangIsChina(isChineseLanguageClient());
|
a479f295
孙向锦
添加了报表逻辑
|
145
|
List<PageData> varList = homeworkService.list(page); // 列出Homework列表
|
1ee08611
jack
1.英文翻译(2)
|
146
147
148
149
150
151
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_list");
}else{
mv.setViewName("sunvote/homework/en_homework_list");
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
152
153
|
mv.addObject("varList", varList);
mv.addObject("pd", pd);
|
a479f295
孙向锦
添加了报表逻辑
|
154
|
mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
155
156
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
157
158
159
160
|
/**
* 去新增页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
161
162
163
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
164
165
|
@RequestMapping(value = "/goAdd")
public ModelAndView goAdd() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
166
167
168
169
170
171
172
|
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
孙向锦
添加了报表逻辑
|
173
|
}
|
2c6bc93d
孙向锦
更新作业
|
174
|
|
85ea5817
孙向锦
布置练习更新
|
175
176
177
178
179
180
181
182
183
184
185
|
/**
* 去新增页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goAdd2")
public ModelAndView goAdd2() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
5b1fa3bc
孙向锦
修复bug
|
186
187
188
|
// 添加科目ID
pd.put("TEACHER_ID", getTeacherID());
pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
|
1ee08611
jack
1.英文翻译(2)
|
189
190
191
192
193
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_edit2");
}else{
mv.setViewName("sunvote/homework/en_homework_edit2");
}
|
85ea5817
孙向锦
布置练习更新
|
194
|
mv.addObject("msg", "save");
|
8952fd04
孙向锦
添加浏览功能
|
195
|
mv.addObject("operation", "add");
|
85ea5817
孙向锦
布置练习更新
|
196
197
198
|
mv.addObject("pd", pd);
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
199
|
|
5b1fa3bc
孙向锦
修复bug
|
200
|
/**
|
a479f295
孙向锦
添加了报表逻辑
|
201
202
|
* 去修改页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
203
204
205
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
206
207
|
@RequestMapping(value = "/goEdit")
public ModelAndView goEdit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
208
209
210
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
211
|
pd = homeworkService.findById(pd); // 根据ID读取
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
212
213
214
215
|
mv.setViewName("sunvote/homework/homework_edit");
mv.addObject("msg", "edit");
mv.addObject("pd", pd);
return mv;
|
a479f295
孙向锦
添加了报表逻辑
|
216
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
217
|
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
218
219
220
221
222
223
224
225
226
227
228
229
|
/**
* 去修改页面
*
* @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
孙向锦
布置练习更新
|
230
|
pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
|
fcd1fe57
孙向锦
报表数据
|
231
|
pd.put("TEACHER_ID", getTeacherID());
|
1ee08611
jack
1.英文翻译(2)
|
232
233
234
235
236
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_edit2");
}else{
mv.setViewName("sunvote/homework/en_homework_edit2");
}
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
237
|
mv.addObject("msg", "edit");
|
8952fd04
孙向锦
添加浏览功能
|
238
239
240
241
242
243
|
mv.addObject("operation", "edit");
mv.addObject("pd", pd);
return mv;
}
/**
|
892c3766
=
1、增加练习报表页面
|
244
|
* 去预览页面
|
8952fd04
孙向锦
添加浏览功能
|
245
246
247
248
249
250
251
252
253
254
255
|
*
* @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
孙向锦
报表数据
|
256
|
pd.put("TEACHER_ID", getTeacherID());
|
1ee08611
jack
1.英文翻译(2)
|
257
258
259
260
261
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_view");
}else{
mv.setViewName("sunvote/homework/en_homework_view");
}
|
8952fd04
孙向锦
添加浏览功能
|
262
263
|
mv.addObject("msg", "edit");
mv.addObject("operation", "view");
|
892c3766
=
1、增加练习报表页面
|
264
265
266
|
mv.addObject("pd", pd);
return mv;
}
|
94ab1e18
孙向锦
删除重复的action
|
267
|
|
a28085c0
孙向锦
修改班级编辑bug
|
268
|
|
6dd8580c
孙向锦
修改报表数据
|
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
|
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
|
291
292
293
294
295
296
297
298
299
300
301
302
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/report")
public ModelAndView report() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
b3c44d84
孙向锦
课后练bug修复
|
303
304
305
|
if(pd.get("SCHOOL_ID") == null || "".equals(pd.get("SCHOOL_ID").toString().trim())){
pd.put("TEACHER_ID", getTeacherID());
}
|
6dd8580c
孙向锦
修改报表数据
|
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
|
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
孙向锦
报表数据
|
322
|
List<PageData> list = coursemanagementService.listTeacherClass(pd);
|
6dd8580c
孙向锦
修改报表数据
|
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
|
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
孙向锦
添加空判断
|
338
339
340
341
|
if (pd.get("CLASS_ID") != null) {
// 对应班级数据
PageData data = new PageData();
List<PageData> studentList = studentService.findByClassId(pd);
|
0a4dfe03
孙向锦
修改报表数据不应该出现的bug
|
342
|
pd.put("COMPLETE_COUNT", "1");
|
41bc74d2
孙向锦
添加空判断
|
343
344
345
346
347
|
List<PageData> homeworkList = homeworkService.listAll(pd);
List<PageData> dataList = homeworkService.report(pd);
for (PageData stuPd : studentList) {
double all = 0;
double get = 0;
|
1cbf6605
孙向锦
作业报表更新
|
348
349
|
int sc = 0 ;
int ac = 0 ;
|
41bc74d2
孙向锦
添加空判断
|
350
|
for (PageData dpd : dataList) {
|
a2414076
孙向锦
修改谢曲提交过来的bug
|
351
|
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
孙向锦
添加空判断
|
352
353
354
355
356
357
358
359
360
361
362
363
364
365
|
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
孙向锦
作业报表更新
|
366
367
368
369
370
371
372
373
374
375
376
377
378
|
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
孙向锦
添加报表百分比数据
|
379
|
}
|
6dd8580c
孙向锦
修改报表数据
|
380
|
}
|
41bc74d2
孙向锦
添加空判断
|
381
382
|
stuPd.put("STUDENT_ALL_SCORE", get);
stuPd.put("PAPER_ALL_SCORE", all);
|
1cbf6605
孙向锦
作业报表更新
|
383
384
|
stuPd.put("COMPLETE_COUNT", sc);
stuPd.put("ALL_COUNT", ac);
|
41bc74d2
孙向锦
添加空判断
|
385
386
387
388
|
stuPd.remove("SCHOOL_ID");
stuPd.remove("SEX");
stuPd.remove("CLASS_ID");
stuPd.remove("NUMBER");
|
22e695bf
孙向锦
添加学生ID传送
|
389
|
stuPd.put("STUDENT_ID", stuPd.get("ID"));
|
41bc74d2
孙向锦
添加空判断
|
390
|
stuPd.remove("ID");
|
bd553929
孙向锦
修改接口
|
391
|
}
|
a764d288
孙向锦
修改课后练bug
|
392
|
|
41bc74d2
孙向锦
添加空判断
|
393
394
395
396
397
398
399
400
401
402
403
404
405
406
|
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
孙向锦
添加空判断
|
407
408
409
410
411
412
|
}
data.put("HOMEWORKS", homeworkList);//
data.put("STUDENTS", studentList);
pd.put("DATA", data);
}else{
pd.put("CLASS_ID", "");
|
fcd1fe57
孙向锦
报表数据
|
413
|
}
|
76263c7c
孙向锦
添加报表百分比数据
|
414
|
pd.remove("JSON");
|
1ee08611
jack
1.英文翻译(2)
|
415
416
417
418
419
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_report");
}else{
mv.setViewName("sunvote/homework/en_homework_report");
}
|
a28085c0
孙向锦
修改班级编辑bug
|
420
421
422
|
mv.addObject("pd", pd);
return mv;
}
|
4431f0b7
孙向锦
报表页面
|
423
424
|
|
a2414076
孙向锦
修改谢曲提交过来的bug
|
425
426
427
428
429
430
431
432
433
434
435
|
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
孙向锦
报表页面
|
436
437
438
439
440
441
442
443
444
445
446
447
|
/**
* 去修改页面
*
* @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
孙向锦
报表页面
|
448
449
450
451
452
453
454
455
456
457
458
459
|
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
孙向锦
添加数据
|
460
|
String studentId = pd.getString("STUDENT_ID") ;
|
40af1dd5
jack
1、修改学生报表界面(2)
|
461
|
//pd.remove("STUDENT_ID");
|
6a210cdd
孙向锦
添加数据
|
462
463
|
List<PageData> dataList = homeworkService.report(pd);
pd.put("DATA", dataList);
|
80838e9c
孙向锦
修改时间不能使用的bug
|
464
465
466
467
|
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
|
4431f0b7
孙向锦
报表页面
|
468
|
pd.remove("JSON");
|
6a210cdd
孙向锦
添加数据
|
469
|
pd.put("STUDENT_ID", studentId);
|
1ee08611
jack
1.英文翻译(2)
|
470
471
472
473
474
475
|
if(isChineseLanguageClient()){
mv.setViewName("sunvote/homework/homework_student_report");
}else{
mv.setViewName("sunvote/homework/en_homework_student_report");
}
|
4431f0b7
孙向锦
报表页面
|
476
|
mv.addObject("pd", pd);
|
6a210cdd
孙向锦
添加数据
|
477
478
|
Gson gson = new Gson();
mv.addObject("data",gson.toJson(pd));
|
4431f0b7
孙向锦
报表页面
|
479
480
481
|
return mv;
}
|
6a210cdd
孙向锦
添加数据
|
482
483
484
485
486
487
488
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
516
517
518
519
|
/**
* 去修改页面
*
* @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
孙向锦
报表页面
|
520
521
522
523
524
525
526
527
528
529
530
531
532
533
|
/**
* 去修改页面
*
* @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
孙向锦
报表页面
|
534
535
536
537
538
539
540
541
542
543
544
545
|
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
|
546
547
|
if(pd.get("HOMEWORK_ID") != null){
List<PageData> dataList = homeworkService.report(pd);
|
a764d288
孙向锦
修改课后练bug
|
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
|
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
|
597
598
599
600
601
602
603
|
pd.put("DATA", dataList);
}
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
|
c93a7724
孙向锦
添加试卷描述
|
604
605
|
pd.put("HOMEWORKINFO", homeworkService.findById(pd));
|
4431f0b7
孙向锦
报表页面
|
606
607
608
609
610
|
pd.remove("JSON");
mv.setViewName("sunvote/homework/homework_item_report");
mv.addObject("pd", pd);
return mv;
}
|
6a210cdd
孙向锦
添加数据
|
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
|
@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
孙向锦
报表页面
|
646
|
|
a28085c0
孙向锦
修改班级编辑bug
|
647
|
|
a479f295
孙向锦
添加了报表逻辑
|
648
649
650
651
|
/**
* 批量删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
652
653
654
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
655
|
@RequestMapping(value = "/deleteAll")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
656
|
@ResponseBody
|
a479f295
孙向锦
添加了报表逻辑
|
657
658
|
public Object deleteAll() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
|
a479f295
孙向锦
添加了报表逻辑
|
659
660
|
PageData pd = new PageData();
Map<String, Object> map = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
661
662
663
|
pd = this.getPageData();
List<PageData> pdList = new ArrayList<PageData>();
String DATA_IDS = pd.getString("DATA_IDS");
|
a479f295
孙向锦
添加了报表逻辑
|
664
|
if (null != DATA_IDS && !"".equals(DATA_IDS)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
665
|
String ArrayDATA_IDS[] = DATA_IDS.split(",");
|
015d5970
孙向锦
更新删除接口
|
666
|
homeworkService.deleteHomeworkAll(ArrayDATA_IDS);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
667
|
pd.put("msg", "ok");
|
a479f295
孙向锦
添加了报表逻辑
|
668
|
} else {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
669
670
671
672
673
674
|
pd.put("msg", "no");
}
pdList.add(pd);
map.put("list", pdList);
return AppUtil.returnObject(pd, map);
}
|
a479f295
孙向锦
添加了报表逻辑
|
675
676
677
678
|
/**
* 导出到excel
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
679
680
681
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
682
683
684
685
686
687
|
@RequestMapping(value = "/excel")
public ModelAndView exportExcel() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "导出Homework到excel");
if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
return null;
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
688
689
690
|
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
691
|
Map<String, Object> dataMap = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
692
|
List<String> titles = new ArrayList<String>();
|
a479f295
孙向锦
添加了报表逻辑
|
693
694
695
696
697
698
699
700
701
702
703
|
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
孙向锦
添加课后作业基础模块数据
|
704
705
706
|
dataMap.put("titles", titles);
List<PageData> varOList = homeworkService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
|
a479f295
孙向锦
添加了报表逻辑
|
707
|
for (int i = 0; i < varOList.size(); i++) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
708
|
PageData vpd = new PageData();
|
a479f295
孙向锦
添加了报表逻辑
|
709
710
711
712
713
714
715
716
717
718
719
|
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
孙向锦
添加课后作业基础模块数据
|
720
721
722
723
|
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
|
a479f295
孙向锦
添加了报表逻辑
|
724
|
mv = new ModelAndView(erv, dataMap);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
725
726
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
727
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
728
|
@InitBinder
|
a479f295
孙向锦
添加了报表逻辑
|
729
|
public void initBinder(WebDataBinder binder) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
730
|
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
a479f295
孙向锦
添加了报表逻辑
|
731
732
733
734
735
736
737
738
739
740
741
742
743
744
|
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
|
745
746
747
748
749
750
751
752
753
754
755
|
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
孙向锦
添加了报表逻辑
|
756
757
|
Gson gson = new Gson();
return gson.toJson(pd);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
758
|
}
|
a28085c0
孙向锦
修改班级编辑bug
|
759
760
|
|
5162dcee
孙向锦
添加上传作业接口
|
761
|
|
2514d928
孙向锦
添加课后作ye,API
|
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
|
/**
* 列表
*
* @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
孙向锦
添加上传作业接口
|
782
783
784
|
@RequestMapping(value = "/savedata", produces = "application/json;charset=UTF-8")
@ResponseBody
|
2514d928
孙向锦
添加课后作ye,API
|
785
786
787
|
public String savedata() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
|
5162dcee
孙向锦
添加上传作业接口
|
788
|
pd.put("HOMEWORK_ID", this.get32UUID());
|
0786f023
孙向锦
修改教师不能删除的bug
|
789
|
pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
|
2514d928
孙向锦
添加课后作ye,API
|
790
791
792
793
794
|
homeworkService.save(pd);
ResponseGson<String> responseGson = new ResponseGson<String>();
responseGson.setData(pd.getString("HOMEWORK_ID"));
return responseGson.toJson();
}
|
02c4ed52
孙向锦
更新上传作业接口
|
795
|
|
5162dcee
孙向锦
添加上传作业接口
|
796
797
798
799
800
801
802
803
|
@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
孙向锦
更新上传作业接口
|
804
|
|
5162dcee
孙向锦
添加上传作业接口
|
805
|
Homework homework = Homework.parse(data);
|
02c4ed52
孙向锦
更新上传作业接口
|
806
|
|
b3c44d84
孙向锦
课后练bug修复
|
807
808
809
|
pd.put("ID", getTeacherID());
PageData tmpd = teacherService.findById(pd);
|
5162dcee
孙向锦
添加上传作业接口
|
810
|
PageData hpd = new PageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
811
812
813
|
if (homework != null) {
hpd.put("CODE", get32UUID());
hpd.put("NAME", homework.getNAME());
|
5b1fa3bc
孙向锦
修复bug
|
814
|
if(homework.getSUBJECT_ID() == null){
|
0786f023
孙向锦
修改教师不能删除的bug
|
815
|
pd.put("TEACHER_ID", homework.getTEACHER_ID());
|
5b1fa3bc
孙向锦
修复bug
|
816
817
818
819
820
|
List<PageData> slist = homeworkService.querySubjectId(pd);
if(slist.size() > 0){
homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
}
}
|
02c4ed52
孙向锦
更新上传作业接口
|
821
822
823
824
825
826
827
828
|
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修复
|
829
|
hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
|
02c4ed52
孙向锦
更新上传作业接口
|
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
|
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
孙向锦
布置练习更新
|
858
|
responseGson.setData(hpd.getString("CODE"));
|
02c4ed52
孙向锦
更新上传作业接口
|
859
860
861
862
863
|
} else {
responseGson.setDataError();
}
} else {
responseGson.setDataError();
|
5162dcee
孙向锦
添加上传作业接口
|
864
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
865
866
|
return responseGson.toJson();
}
|
2c6bc93d
孙向锦
更新作业
|
867
868
869
870
871
872
873
874
875
876
877
|
@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修复
|
878
879
|
pd.put("ID", getTeacherID());
PageData tmpd = teacherService.findById(pd);
|
2c6bc93d
孙向锦
更新作业
|
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
|
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修复
|
897
|
hpd.put("SCHOOL_ID", tmpd.get("SCHOOL_ID"));
|
2c6bc93d
孙向锦
更新作业
|
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
|
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();
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
956
|
}
|