|
@@ -343,10 +343,11 @@ public class PaperClassService {
|
343
|
343
|
//遍历班级,班级学生
|
344
|
344
|
for (PaperClassParam c : classlst) {
|
345
|
345
|
Integer classid = c.getClassid();
|
|
346
|
+ Integer hasfc = c.getHasfc();
|
346
|
347
|
List<PaperStudentParam> students = c.getStudents();
|
347
|
348
|
//处理作业分组数据
|
348
|
349
|
stunum = setPaperGroup2(stunum, pquestions, timestamp, papertype, schoolid, paperid
|
349
|
|
- , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students);
|
|
350
|
+ , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students,hasfc);
|
350
|
351
|
}
|
351
|
352
|
|
352
|
353
|
//集团校班级学生
|
|
@@ -355,10 +356,11 @@ public class PaperClassService {
|
355
|
356
|
List<Map> classlist = (List<Map>) schoolmap.get("classlist");
|
356
|
357
|
for (Map classmap : classlist) {
|
357
|
358
|
Integer classid = Integer.parseInt(classmap.get("classid").toString());
|
|
359
|
+ Integer hasfc = Integer.parseInt(classmap.get("hasfc").toString());
|
358
|
360
|
List<PaperStudentParam> students = JSON.parseArray(JSON.toJSONString(classmap.get("students")), PaperStudentParam.class);
|
359
|
361
|
//处理作业分组数据
|
360
|
362
|
stunum = setPaperGroup2(stunum, pquestions, timestamp, papertype, schoolid, paperid
|
361
|
|
- , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students);
|
|
363
|
+ , starttime, stoptime, showtype, createid, papernum, paperscore, classid, students,hasfc);
|
362
|
364
|
}
|
363
|
365
|
}
|
364
|
366
|
|
|
@@ -389,7 +391,7 @@ public class PaperClassService {
|
389
|
391
|
private Integer setPaperGroup2(Integer stunum
|
390
|
392
|
, List<TPaperQtypeQuestion> pquestions, Integer timestamp, Integer papertype, Integer schoolid
|
391
|
393
|
, Integer paperid, Integer starttime, Integer stoptime, Integer showtype, Integer createid
|
392
|
|
- , Integer papernum, Double paperscore, Integer classid, List<PaperStudentParam> students) {
|
|
394
|
+ , Integer papernum, Double paperscore, Integer classid, List<PaperStudentParam> students,Integer hasfc) {
|
393
|
395
|
List<TPaperStudentQuestion> savestuque=new ArrayList<>();
|
394
|
396
|
if (N_Utils.isListNotEmpty(students)) {
|
395
|
397
|
TPaperClass pg = new TPaperClass();
|
|
@@ -403,6 +405,7 @@ public class PaperClassService {
|
403
|
405
|
pg.setSchoolid(schoolid);
|
404
|
406
|
pg.setCreatetime(timestamp);
|
405
|
407
|
pg.setChecked(0);
|
|
408
|
+ pg.setHasfc(hasfc);
|
406
|
409
|
paperClassMapper.insertSelective(pg);
|
407
|
410
|
|
408
|
411
|
//根据studentid集合去重
|