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();
|
91de7adc
孙向锦
添加管理员页面
|
128
129
130
|
if(pd.get("TEACHER_ID") == null){
pd.put("TEACHER_ID", getTeacherID());
}
|
2c6bc93d
孙向锦
更新作业
|
131
|
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
132
133
|
String keywords = pd.getString("keywords"); // 关键词检索条件
if (null != keywords && !"".equals(keywords)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
134
135
136
|
pd.put("keywords", keywords.trim());
}
page.setPd(pd);
|
a479f295
孙向锦
添加了报表逻辑
|
137
|
List<PageData> varList = homeworkService.list(page); // 列出Homework列表
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
138
139
140
|
mv.setViewName("sunvote/homework/homework_list");
mv.addObject("varList", varList);
mv.addObject("pd", pd);
|
a479f295
孙向锦
添加了报表逻辑
|
141
|
mv.addObject("QX", Jurisdiction.getHC()); // 按钮权限
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
142
143
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
144
145
146
147
|
/**
* 去新增页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
148
149
150
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
151
152
|
@RequestMapping(value = "/goAdd")
public ModelAndView goAdd() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
153
154
155
156
157
158
159
|
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
孙向锦
添加了报表逻辑
|
160
|
}
|
2c6bc93d
孙向锦
更新作业
|
161
|
|
85ea5817
孙向锦
布置练习更新
|
162
163
164
165
166
167
168
169
170
171
172
|
/**
* 去新增页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/goAdd2")
public ModelAndView goAdd2() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
5b1fa3bc
孙向锦
修复bug
|
173
174
175
|
// 添加科目ID
pd.put("TEACHER_ID", getTeacherID());
pd.put("SUBJECT_ID", homeworkService.querySubjectId(pd));
|
85ea5817
孙向锦
布置练习更新
|
176
177
|
mv.setViewName("sunvote/homework/homework_edit2");
mv.addObject("msg", "save");
|
8952fd04
孙向锦
添加浏览功能
|
178
|
mv.addObject("operation", "add");
|
85ea5817
孙向锦
布置练习更新
|
179
180
181
|
mv.addObject("pd", pd);
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
182
|
|
5b1fa3bc
孙向锦
修复bug
|
183
|
/**
|
a479f295
孙向锦
添加了报表逻辑
|
184
185
|
* 去修改页面
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
186
187
188
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
189
190
|
@RequestMapping(value = "/goEdit")
public ModelAndView goEdit() throws Exception {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
191
192
193
|
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
194
|
pd = homeworkService.findById(pd); // 根据ID读取
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
195
196
197
198
|
mv.setViewName("sunvote/homework/homework_edit");
mv.addObject("msg", "edit");
mv.addObject("pd", pd);
return mv;
|
a479f295
孙向锦
添加了报表逻辑
|
199
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
200
|
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
201
202
203
204
205
206
207
208
209
210
211
212
|
/**
* 去修改页面
*
* @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
孙向锦
布置练习更新
|
213
|
pd.put("QUESTIONS", homeworkproblemService.listProblem(pd));
|
fcd1fe57
孙向锦
报表数据
|
214
|
pd.put("TEACHER_ID", getTeacherID());
|
8fb81e72
=
1.增加练习列表页和布置练习页面
|
215
216
|
mv.setViewName("sunvote/homework/homework_edit2");
mv.addObject("msg", "edit");
|
8952fd04
孙向锦
添加浏览功能
|
217
218
219
220
221
222
|
mv.addObject("operation", "edit");
mv.addObject("pd", pd);
return mv;
}
/**
|
892c3766
=
1、增加练习报表页面
|
223
|
* 去预览页面
|
8952fd04
孙向锦
添加浏览功能
|
224
225
226
227
228
229
230
231
232
233
234
|
*
* @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
孙向锦
报表数据
|
235
|
pd.put("TEACHER_ID", getTeacherID());
|
dafcdfc6
=
1.
|
236
|
mv.setViewName("sunvote/homework/homework_view");
|
8952fd04
孙向锦
添加浏览功能
|
237
238
|
mv.addObject("msg", "edit");
mv.addObject("operation", "view");
|
892c3766
=
1、增加练习报表页面
|
239
240
241
|
mv.addObject("pd", pd);
return mv;
}
|
94ab1e18
孙向锦
删除重复的action
|
242
|
|
a28085c0
孙向锦
修改班级编辑bug
|
243
|
|
6dd8580c
孙向锦
修改报表数据
|
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
|
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
|
266
267
268
269
270
271
272
273
274
275
276
277
|
/**
* 去修改页面
*
* @param
* @throws Exception
*/
@RequestMapping(value = "/report")
public ModelAndView report() throws Exception {
ModelAndView mv = this.getModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
fcd1fe57
孙向锦
报表数据
|
278
|
pd.put("TEACHER_ID", getTeacherID());
|
6dd8580c
孙向锦
修改报表数据
|
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
|
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
孙向锦
报表数据
|
295
|
List<PageData> list = coursemanagementService.listTeacherClass(pd);
|
6dd8580c
孙向锦
修改报表数据
|
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
|
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
孙向锦
添加空判断
|
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
|
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
孙向锦
添加报表百分比数据
|
337
|
}
|
6dd8580c
孙向锦
修改报表数据
|
338
|
}
|
41bc74d2
孙向锦
添加空判断
|
339
340
|
stuPd.put("STUDENT_ALL_SCORE", get);
stuPd.put("PAPER_ALL_SCORE", all);
|
e374f3ed
孙向锦
更新报表数据
|
341
342
|
stuPd.put("COMPLETE_COUNT", 1);
stuPd.put("ALL_COUNT", 1);
|
41bc74d2
孙向锦
添加空判断
|
343
344
345
346
|
stuPd.remove("SCHOOL_ID");
stuPd.remove("SEX");
stuPd.remove("CLASS_ID");
stuPd.remove("NUMBER");
|
22e695bf
孙向锦
添加学生ID传送
|
347
|
stuPd.put("STUDENT_ID", stuPd.get("ID"));
|
41bc74d2
孙向锦
添加空判断
|
348
|
stuPd.remove("ID");
|
bd553929
孙向锦
修改接口
|
349
|
}
|
41bc74d2
孙向锦
添加空判断
|
350
351
352
353
354
355
356
357
358
359
360
361
362
363
|
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
孙向锦
添加空判断
|
364
365
366
367
368
369
|
}
data.put("HOMEWORKS", homeworkList);//
data.put("STUDENTS", studentList);
pd.put("DATA", data);
}else{
pd.put("CLASS_ID", "");
|
fcd1fe57
孙向锦
报表数据
|
370
|
}
|
76263c7c
孙向锦
添加报表百分比数据
|
371
|
pd.remove("JSON");
|
a28085c0
孙向锦
修改班级编辑bug
|
372
373
374
375
|
mv.setViewName("sunvote/homework/homework_report");
mv.addObject("pd", pd);
return mv;
}
|
4431f0b7
孙向锦
报表页面
|
376
377
378
379
380
381
382
383
384
385
386
387
388
389
|
/**
* 去修改页面
*
* @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
孙向锦
报表页面
|
390
391
392
393
394
395
396
397
398
399
400
401
|
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
孙向锦
添加数据
|
402
|
String studentId = pd.getString("STUDENT_ID") ;
|
40af1dd5
jack
1、修改学生报表界面(2)
|
403
|
//pd.remove("STUDENT_ID");
|
6a210cdd
孙向锦
添加数据
|
404
405
|
List<PageData> dataList = homeworkService.report(pd);
pd.put("DATA", dataList);
|
80838e9c
孙向锦
修改时间不能使用的bug
|
406
407
408
409
|
if(pd.get("CLASS_ID") != null){
List<PageData> studentList = studentService.findByClassId(pd);
pd.put("STUDENTS", studentList);
}
|
4431f0b7
孙向锦
报表页面
|
410
|
pd.remove("JSON");
|
6a210cdd
孙向锦
添加数据
|
411
|
pd.put("STUDENT_ID", studentId);
|
4431f0b7
孙向锦
报表页面
|
412
413
|
mv.setViewName("sunvote/homework/homework_student_report");
mv.addObject("pd", pd);
|
6a210cdd
孙向锦
添加数据
|
414
415
|
Gson gson = new Gson();
mv.addObject("data",gson.toJson(pd));
|
4431f0b7
孙向锦
报表页面
|
416
417
418
|
return mv;
}
|
6a210cdd
孙向锦
添加数据
|
419
420
421
422
423
424
425
426
427
428
429
430
431
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
|
/**
* 去修改页面
*
* @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
孙向锦
报表页面
|
457
458
459
460
461
462
463
464
465
466
467
468
469
470
|
/**
* 去修改页面
*
* @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
孙向锦
报表页面
|
471
472
473
474
475
476
477
478
479
480
481
482
|
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
|
483
484
485
486
487
488
489
490
491
|
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);
}
|
c93a7724
孙向锦
添加试卷描述
|
492
493
|
pd.put("HOMEWORKINFO", homeworkService.findById(pd));
|
4431f0b7
孙向锦
报表页面
|
494
495
496
497
498
|
pd.remove("JSON");
mv.setViewName("sunvote/homework/homework_item_report");
mv.addObject("pd", pd);
return mv;
}
|
6a210cdd
孙向锦
添加数据
|
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
|
@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
孙向锦
报表页面
|
534
|
|
a28085c0
孙向锦
修改班级编辑bug
|
535
|
|
a479f295
孙向锦
添加了报表逻辑
|
536
537
538
539
|
/**
* 批量删除
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
540
541
542
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
543
|
@RequestMapping(value = "/deleteAll")
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
544
|
@ResponseBody
|
a479f295
孙向锦
添加了报表逻辑
|
545
546
|
public Object deleteAll() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "批量删除Homework");
|
a479f295
孙向锦
添加了报表逻辑
|
547
548
|
PageData pd = new PageData();
Map<String, Object> map = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
549
550
551
|
pd = this.getPageData();
List<PageData> pdList = new ArrayList<PageData>();
String DATA_IDS = pd.getString("DATA_IDS");
|
a479f295
孙向锦
添加了报表逻辑
|
552
|
if (null != DATA_IDS && !"".equals(DATA_IDS)) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
553
|
String ArrayDATA_IDS[] = DATA_IDS.split(",");
|
015d5970
孙向锦
更新删除接口
|
554
|
homeworkService.deleteHomeworkAll(ArrayDATA_IDS);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
555
|
pd.put("msg", "ok");
|
a479f295
孙向锦
添加了报表逻辑
|
556
|
} else {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
557
558
559
560
561
562
|
pd.put("msg", "no");
}
pdList.add(pd);
map.put("list", pdList);
return AppUtil.returnObject(pd, map);
}
|
a479f295
孙向锦
添加了报表逻辑
|
563
564
565
566
|
/**
* 导出到excel
*
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
567
568
569
|
* @param
* @throws Exception
*/
|
a479f295
孙向锦
添加了报表逻辑
|
570
571
572
573
574
575
|
@RequestMapping(value = "/excel")
public ModelAndView exportExcel() throws Exception {
logBefore(logger, Jurisdiction.getUsername() + "导出Homework到excel");
if (!Jurisdiction.buttonJurisdiction(menuUrl, "cha")) {
return null;
}
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
576
577
578
|
ModelAndView mv = new ModelAndView();
PageData pd = new PageData();
pd = this.getPageData();
|
a479f295
孙向锦
添加了报表逻辑
|
579
|
Map<String, Object> dataMap = new HashMap<String, Object>();
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
580
|
List<String> titles = new ArrayList<String>();
|
a479f295
孙向锦
添加了报表逻辑
|
581
582
583
584
585
586
587
588
589
590
591
|
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
孙向锦
添加课后作业基础模块数据
|
592
593
594
|
dataMap.put("titles", titles);
List<PageData> varOList = homeworkService.listAll(pd);
List<PageData> varList = new ArrayList<PageData>();
|
a479f295
孙向锦
添加了报表逻辑
|
595
|
for (int i = 0; i < varOList.size(); i++) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
596
|
PageData vpd = new PageData();
|
a479f295
孙向锦
添加了报表逻辑
|
597
598
599
600
601
602
603
604
605
606
607
|
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
孙向锦
添加课后作业基础模块数据
|
608
609
610
611
|
varList.add(vpd);
}
dataMap.put("varList", varList);
ObjectExcelView erv = new ObjectExcelView();
|
a479f295
孙向锦
添加了报表逻辑
|
612
|
mv = new ModelAndView(erv, dataMap);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
613
614
|
return mv;
}
|
a479f295
孙向锦
添加了报表逻辑
|
615
|
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
616
|
@InitBinder
|
a479f295
孙向锦
添加了报表逻辑
|
617
|
public void initBinder(WebDataBinder binder) {
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
618
|
DateFormat format = new SimpleDateFormat("yyyy-MM-dd");
|
a479f295
孙向锦
添加了报表逻辑
|
619
620
621
622
623
624
625
626
627
628
629
630
631
632
|
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
|
633
634
635
636
637
638
639
640
641
642
643
|
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
孙向锦
添加了报表逻辑
|
644
645
|
Gson gson = new Gson();
return gson.toJson(pd);
|
be2f84a1
孙向锦
添加课后作业基础模块数据
|
646
|
}
|
a28085c0
孙向锦
修改班级编辑bug
|
647
648
|
|
5162dcee
孙向锦
添加上传作业接口
|
649
|
|
2514d928
孙向锦
添加课后作ye,API
|
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
|
/**
* 列表
*
* @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
孙向锦
添加上传作业接口
|
670
671
672
|
@RequestMapping(value = "/savedata", produces = "application/json;charset=UTF-8")
@ResponseBody
|
2514d928
孙向锦
添加课后作ye,API
|
673
674
675
|
public String savedata() throws Exception {
PageData pd = new PageData();
pd = this.getPageData();
|
5162dcee
孙向锦
添加上传作业接口
|
676
|
pd.put("HOMEWORK_ID", this.get32UUID());
|
2514d928
孙向锦
添加课后作ye,API
|
677
678
679
680
681
|
homeworkService.save(pd);
ResponseGson<String> responseGson = new ResponseGson<String>();
responseGson.setData(pd.getString("HOMEWORK_ID"));
return responseGson.toJson();
}
|
02c4ed52
孙向锦
更新上传作业接口
|
682
|
|
5162dcee
孙向锦
添加上传作业接口
|
683
684
685
686
687
688
689
690
|
@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
孙向锦
更新上传作业接口
|
691
|
|
5162dcee
孙向锦
添加上传作业接口
|
692
|
Homework homework = Homework.parse(data);
|
02c4ed52
孙向锦
更新上传作业接口
|
693
|
|
5162dcee
孙向锦
添加上传作业接口
|
694
|
PageData hpd = new PageData();
|
02c4ed52
孙向锦
更新上传作业接口
|
695
696
697
|
if (homework != null) {
hpd.put("CODE", get32UUID());
hpd.put("NAME", homework.getNAME());
|
5b1fa3bc
孙向锦
修复bug
|
698
699
700
701
702
703
|
if(homework.getSUBJECT_ID() == null){
List<PageData> slist = homeworkService.querySubjectId(pd);
if(slist.size() > 0){
homework.setSUBJECT_ID(slist.get(0).getString("SUBJECT_ID"));
}
}
|
02c4ed52
孙向锦
更新上传作业接口
|
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
|
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
孙向锦
布置练习更新
|
740
|
responseGson.setData(hpd.getString("CODE"));
|
02c4ed52
孙向锦
更新上传作业接口
|
741
742
743
744
745
|
} else {
responseGson.setDataError();
}
} else {
responseGson.setDataError();
|
5162dcee
孙向锦
添加上传作业接口
|
746
|
}
|
5162dcee
孙向锦
添加上传作业接口
|
747
748
|
return responseGson.toJson();
}
|
2c6bc93d
孙向锦
更新作业
|
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
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
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
|
@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
孙向锦
添加课后作业基础模块数据
|
836
|
}
|