|
@@ -80,10 +80,9 @@ public class ExamSubjectPaperServiceImpl extends BaseQueryService<ExamSubjectPap
|
|
|
double totalScore = examSubjectPaper.getTotalScore();
|
|
double totalScore = examSubjectPaper.getTotalScore();
|
|
|
Integer n = examSubjectPaper.getObjective();
|
|
Integer n = examSubjectPaper.getObjective();
|
|
|
Integer m =1;
|
|
Integer m =1;
|
|
|
- System.out.println("客观是否："+n);
|
|
|
|
|
DecimalFormat df = new DecimalFormat("######0");
|
|
DecimalFormat df = new DecimalFormat("######0");
|
|
|
//先查询eb_exam_subject 表中是否有对应的试卷详细结构信息
|
|
//先查询eb_exam_subject 表中是否有对应的试卷详细结构信息
|
|
|
- List<ExamQuestion> examQuestionList = examQuestionDao.findByExamIdAndSubjectCodeAndObjectiveAndMainNumber(examSubjectPaper.getExamId(), examSubjectPaper.getCode(), true, examSubjectPaper.getMainNumber());
|
|
|
|
|
|
|
+ List<ExamQuestion> examQuestionList = examQuestionDao.findByExamIdAndSubjectCodeAndObjectiveAndMainNumber(examSubjectPaper.getExamId(), examSubjectPaper.getCode(), (n.equals(1))?true:false, examSubjectPaper.getMainNumber());
|
|
|
|
|
|
|
|
if(examQuestionList.isEmpty()){//则表示第一次编辑试卷详细结构信息(包括：试卷小标题的分数和标答)
|
|
if(examQuestionList.isEmpty()){//则表示第一次编辑试卷详细结构信息(包括：试卷小标题的分数和标答)
|
|
|
if(m.equals(n)){//客观题则补充无效的个数
|
|
if(m.equals(n)){//客观题则补充无效的个数
|
nikang