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;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
8
9
10
11
|
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
|
a479f295
孙向锦
添加了报表逻辑
|
12
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
13
|
import javax.annotation.Resource;
|
a479f295
孙向锦
添加了报表逻辑
|
14
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
15
16
17
18
19
20
21
|
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
孙向锦
添加了报表逻辑
|
22
|
|
5162dcee
孙向锦
添加上传作业接口
|
23
24
25
|
import com.fh.bean.HomeClass;
import com.fh.bean.Homework;
import com.fh.bean.HomeworkQuestion;
|
2514d928
孙向锦
添加课后作ye,API
|
26
|
import com.fh.controller.api.ResponseGson;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
27
28
|
import com.fh.controller.base.BaseController;
import com.fh.entity.Page;
|
fcd1fe57
孙向锦
报表数据
|
29
|
import com.fh.service.sunvote.coursemanagement.CourseManagementManager;
|
a479f295
孙向锦
添加了报表逻辑
|
30
31
|
import com.fh.service.sunvote.homework.HomeworkManager;
import com.fh.service.sunvote.homework.HomeworkReportManager;
|
5162dcee
孙向锦
添加上传作业接口
|
32
|
import com.fh.service.sunvote.homeworkproblem.HomeworkProblemManager;
|
68056c63
孙向锦
添加学生人数
|
33
|
import com.fh.service.sunvote.student.StudentManager;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
34
|
import com.fh.util.AppUtil;
|
a479f295
孙向锦
添加了报表逻辑
|
35
|
import com.fh.util.Jurisdiction;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
36
37
|
import com.fh.util.ObjectExcelView;
import com.fh.util.PageData;
|
a479f295
孙向锦
添加了报表逻辑
|
38
|
import com.google.gson.Gson;
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
39
|
|
a479f295
孙向锦
添加了报表逻辑
|
40
41
|
/**
* 说明:作业 创建人:FH Q313596790 创建时间:2019-03-07
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
42
43
|
*/
@Controller
|
a479f295
孙向锦
添加了报表逻辑
|
44
|
@RequestMapping(value = "/homework")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
45
|
public class HomeworkController extends BaseController {
|
a479f295
孙向锦
添加了报表逻辑
|
46
47
48
|
String menuUrl = "homework/list.do"; // 菜单地址(权限用)
@Resource(name = "homeworkService")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
49
|
private HomeworkManager homeworkService;
|
a479f295
孙向锦
添加了报表逻辑
|
50
51
|
@Resource(name = "homeworkReporService")
private HomeworkReportManager homeworkReporService;
|
02c4ed52
孙向锦
更新上传作业接口
|
52
53
|
@Resource(name = "homeworkproblemService")
|
5162dcee
孙向锦
添加上传作业接口
|
54
|
private HomeworkProblemManager homeworkproblemService;
|
fcd1fe57
孙向锦
报表数据
|
55
56
57
58
59
60
|
@Resource(name="coursemanagementService")
private CourseManagementManager coursemanagementService;
@Resource(name="homeworkReporService")
private HomeworkReportManager homeworkReporkService;
|
68056c63
孙向锦
添加学生人数
|
61
62
63
|
@Resource(name="studentService")
private StudentManager studentService;
|
a479f295
孙向锦
添加了报表逻辑
|
64
65
66
67
|
/**
* 保存
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
68
69
70
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
71
72
73
|
@RequestMapping(value = "/save")
public ModelAndView save() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "新增Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
74
75
76
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
77
|
pd.put("HOMEWORK_ID", this.get32UUID()); // 主键
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
78
|
homeworkService.save(pd);
|
a479f295
孙向锦
添加了报表逻辑
|
79
|
mv.addObject("msg", "success");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
80
81
82
|
mv.setViewName("save_result");
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
83
84
85
86
|
/**
* 删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
87
88
89
|
* @param out
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
90
91
92
|
@RequestMapping(value = "/delete")
public void delete(PrintWriter out) throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "删除Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
93
94
95
96
97
98
|
PageData pd = new PageData();
pd = this.getPageData();
homeworkService.delete(pd);
out.write("success");
out.close();
}
|
a479f295
孙向锦
添加了报表逻辑
|
99
100
101
102
|
/**
* 修改
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
103
104
105
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
106
107
|
@RequestMapping(value = "/edit")
public ModelAndView edit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
108
109
110
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
111
|
|
a479f295
孙向锦
添加了报表逻辑
|
112
|
mv.addObject("msg", "success");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
113
114
115
|
mv.setViewName("save_result");
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
116
117
118
119
|
/**
* 列表
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
120
121
122
|
* @param page
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
123
124
125
|
@RequestMapping(value = "/list")
public ModelAndView list(Page page) throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "列表Homework");
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
126
127
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
|
2c6bc93d
孙向锦
更新作业
|
128
|
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
129
130
|
String keywords = pd.getString("keywords"); // 关键词检索条件
if (null != keywords && !"".equals(keywords)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
131
132
133
|
pd.put("keywords", keywords.trim());
}
page.setPd(pd);
|
a479f295
孙向锦
添加了报表逻辑
|
134
|
List<PageData> varList = homeworkService.list(page); // 列出Homework列表
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
135
136
137
|
mv.setViewName("sunvote/homework/homework_list");
mv.addObject("varList", varList);
mv.addObject("pd", pd);
|
a479f295
孙向锦
添加了报表逻辑
|
138
|
mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
139
140
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
141
142
143
144
|
/**
* 去新增页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
145
146
147
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
148
149
|
@RequestMapping(value = "/goAdd")
public ModelAndView goAdd() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
150
151
152
153
154
155
156
|
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
孙向锦
添加了报表逻辑
|
157
|
}
|
2c6bc93d
孙向锦
更新作业
|
158
|
|
85ea5817
孙向锦
布置练习更新
|
159
160
161
162
163
164
165
166
167
168
169
170
171
|
/**
* 去新增页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goAdd2")
public ModelAndView goAdd2() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
mv.setViewName("sunvote/homework/homework_edit2");
mv.addObject("msg", "save");
|
8952fd04
孙向锦
添加浏览功能
|
172
|
mv.addObject("operation", "add");
|
85ea5817
孙向锦
布置练习更新
|
173
174
175
|
mv.addObject("pd", pd);
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
176
177
178
179
|
/**
* 去修改页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
180
181
182
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
183
184
|
@RequestMapping(value = "/goEdit")
public ModelAndView goEdit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
185
186
187
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
188
|
pd = homeworkService.findById(pd); // 根据ID读取
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
189
190
191
192
|
mv.setViewName("sunvote/homework/homework_edit");
mv.addObject("msg", "edit");
mv.addObject("pd", pd);
return mv;
|
a479f295
孙向锦
添加了报表逻辑
|
193
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
194
|
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
195
196
197
198
199
200
201
202
203
204
205
206
|
/**
* 去修改页面
*
* @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
孙向锦
布置练习更新
|
207
|
pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
|
fcd1fe57
孙向锦
报表数据
|
208
|
pd.put("TEACHER_ID", getTeacherID());
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
209
210
|
mv.setViewName("sunvote/homework/homework_edit2");
mv.addObject("msg", "edit");
|
8952fd04
孙向锦
添加浏览功能
|
211
212
213
214
215
216
|
mv.addObject("operation", "edit");
mv.addObject("pd", pd);
return mv;
}
/**
|
892c3766
=
1、增加练习报表页面
|
217
|
* 去预览页面
|
8952fd04
孙向锦
添加浏览功能
|
218
219
220
221
222
223
224
225
226
227
228
|
*
* @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
孙向锦
报表数据
|
229
|
pd.put("TEACHER_ID", getTeacherID());
|
dafcdfc6
=
1.
|
230
|
mv.setViewName("sunvote/homework/homework_view");
|
8952fd04
孙向锦
添加浏览功能
|
231
232
|
mv.addObject("msg", "edit");
mv.addObject("operation", "view");
|
892c3766
=
1、增加练习报表页面
|
233
234
235
|
mv.addObject("pd", pd);
return mv;
}
|
94ab1e18
孙向锦
删除重复的action
|
236
|
|
a28085c0
孙向锦
修改班级编辑bug
|
237
|
|
6dd8580c
孙向锦
修改报表数据
|
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
|
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
|
260
261
262
263
264
265
266
267
268
269
270
271
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/report")
public ModelAndView report() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
fcd1fe57
孙向锦
报表数据
|
272
|
pd.put("TEACHER_ID", getTeacherID());
|
6dd8580c
孙向锦
修改报表数据
|
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
|
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
孙向锦
报表数据
|
289
|
List<PageData> list = coursemanagementService.listTeacherClass(pd);
|
6dd8580c
孙向锦
修改报表数据
|
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
|
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
孙向锦
添加空判断
|
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
|
if (pd.get("CLASS_ID") != null) {
// 对应班级数据
PageData data = new PageData();
List<PageData> studentList = studentService.findByClassId(pd);
List<PageData> homeworkList = homeworkService.listAll(pd);
List<PageData> dataList = homeworkService.report(pd);
for (PageData stuPd : studentList) {
double all = 0;
double get = 0;
for (PageData dpd : dataList) {
if (dpd.get("STUDENT_ID").equals(stuPd.get("ID"))) {
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) {
}
|
76263c7c
孙向锦
添加报表百分比数据
|
331
|
}
|
6dd8580c
孙向锦
修改报表数据
|
332
|
}
|
41bc74d2
孙向锦
添加空判断
|
333
334
335
336
337
338
339
|
stuPd.put("STUDENT_ALL_SCORE", get);
stuPd.put("PAPER_ALL_SCORE", all);
stuPd.remove("SCHOOL_ID");
stuPd.remove("SEX");
stuPd.remove("CLASS_ID");
stuPd.remove("NUMBER");
stuPd.remove("ID");
|
bd553929
孙向锦
修改接口
|
340
|
}
|
41bc74d2
孙向锦
添加空判断
|
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
|
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");
hpd.remove("COMPLETE_DESC");
}
data.put("HOMEWORKS", homeworkList);//
data.put("STUDENTS", studentList);
pd.put("DATA", data);
}else{
pd.put("CLASS_ID", "");
|
fcd1fe57
孙向锦
报表数据
|
362
|
}
|
76263c7c
孙向锦
添加报表百分比数据
|
363
|
pd.remove("JSON");
|
a28085c0
孙向锦
修改班级编辑bug
|
364
365
366
367
368
|
mv.setViewName("sunvote/homework/homework_report");
mv.addObject("pd", pd);
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
369
370
371
372
|
/**
* 批量删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
373
374
375
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
376
|
@RequestMapping(value = "/deleteAll")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
377
|
@ResponseBody
|
a479f295
孙向锦
添加了报表逻辑
|
378
379
380
381
382
383
384
|
public Object deleteAll() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
if (!Jurisdiction.buttonJurisdiction(menuUrl, "del")) {
return null;
} // 校验权限
PageData pd = new PageData();
Map<String, Object> map = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
385
386
387
|
pd = this.getPageData();
List<PageData> pdList = new ArrayList<PageData>();
String DATA_IDS = pd.getString("DATA_IDS");
|
a479f295
孙向锦
添加了报表逻辑
|
388
|
if (null != DATA_IDS && !"".equals(DATA_IDS)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
389
|
String ArrayDATA_IDS[] = DATA_IDS.split(",");
|
015d5970
孙向锦
更新删除接口
|
390
|
homeworkService.deleteHomeworkAll(ArrayDATA_IDS);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
391
|
pd.put("msg", "ok");
|
a479f295
孙向锦
添加了报表逻辑
|
392
|
} else {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
393
394
395
396
397
398
|
pd.put("msg", "no");
}
pdList.add(pd);
map.put("list", pdList);
return AppUtil.returnObject(pd, map);
}
|
a479f295
孙向锦
添加了报表逻辑
|
399
400
401
402
|
/**
* 导出到excel
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
403
404
405
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
406
407
408
409
410
411
|
@RequestMapping(value = "/excel")
public ModelAndView exportExcel() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "导出Homework到excel");
if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
return null;
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
412
413
414
|
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
415
|
Map<String, Object> dataMap = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
416
|
List<String> titles = new ArrayList<String>();
|
a479f295
孙向锦
添加了报表逻辑
|
417
418
419
420
421
422
423
424
425
426
427
|
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
孙向锦
添加课后作业基础模块数据
|
428
429
430
|
dataMap.put("titles", titles);
List<PageData> varOList = homeworkService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
|
a479f295
孙向锦
添加了报表逻辑
|
431
|
for (int i = 0; i < varOList.size(); i++) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
432
|
PageData vpd = new PageData();
|
a479f295
孙向锦
添加了报表逻辑
|
433
434
435
436
437
438
439
440
441
442
443
|
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
孙向锦
添加课后作业基础模块数据
|
444
445
446
447
|
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
|
a479f295
孙向锦
添加了报表逻辑
|
448
|
mv = new ModelAndView(erv, dataMap);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
449
450
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
451
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
452
|
@InitBinder
|
a479f295
孙向锦
添加了报表逻辑
|
453
|
public void initBinder(WebDataBinder binder) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
454
|
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
a479f295
孙向锦
添加了报表逻辑
|
455
456
457
458
459
460
461
462
463
464
465
466
467
468
|
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
|
469
470
471
472
473
474
475
476
477
478
479
|
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
孙向锦
添加了报表逻辑
|
480
481
|
Gson gson = new Gson();
return gson.toJson(pd);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
482
|
}
|
a28085c0
孙向锦
修改班级编辑bug
|
483
484
|
|
5162dcee
孙向锦
添加上传作业接口
|
485
|
|
2514d928
孙向锦
添加课后作ye,API
|
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
|
/**
* 列表
*
* @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
孙向锦
添加上传作业接口
|
506
507
508
|
@RequestMapping(value = "/savedata", produces = "application/json;charset=UTF-8")
@ResponseBody
|
2514d928
孙向锦
添加课后作ye,API
|
509
510
511
|
public String savedata() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
|
5162dcee
孙向锦
添加上传作业接口
|
512
|
pd.put("HOMEWORK_ID", this.get32UUID());
|
2514d928
孙向锦
添加课后作ye,API
|
513
514
515
516
517
|
homeworkService.save(pd);
ResponseGson<String> responseGson = new ResponseGson<String>();
responseGson.setData(pd.getString("HOMEWORK_ID"));
return responseGson.toJson();
}
|
02c4ed52
孙向锦
更新上传作业接口
|
518
|
|
5162dcee
孙向锦
添加上传作业接口
|
519
520
521
522
523
524
525
526
|
@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
孙向锦
更新上传作业接口
|
527
|
|
5162dcee
孙向锦
添加上传作业接口
|
528
|
Homework homework = Homework.parse(data);
|
02c4ed52
孙向锦
更新上传作业接口
|
529
|
|
5162dcee
孙向锦
添加上传作业接口
|
530
|
PageData hpd = new PageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
|
if (homework != null) {
hpd.put("CODE", get32UUID());
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", "");
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
孙向锦
布置练习更新
|
570
|
responseGson.setData(hpd.getString("CODE"));
|
02c4ed52
孙向锦
更新上传作业接口
|
571
572
573
574
575
|
} else {
responseGson.setDataError();
}
} else {
responseGson.setDataError();
|
5162dcee
孙向锦
添加上传作业接口
|
576
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
577
578
|
return responseGson.toJson();
}
|
2c6bc93d
孙向锦
更新作业
|
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
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
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
|
@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);
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", "");
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
孙向锦
添加课后作业基础模块数据
|
666
|
}
|