报名接口修改,考试计算成绩接口修改，对比答案修改为对比所有题目

Administrator

2021-08-10 c8ebf3038d2a7f69d9eb40f5a276dc3fa826fa9b

 src/main/java/org/springblade/modules/exam/service/impl/ExamSubjectChoicesServiceImpl.java

@@ -7,6 +7,7 @@
import org.springblade.common.utils.arg;
import org.springblade.modules.exam.entity.ExamSubjectChoices;
import org.springblade.modules.exam.entity.ExamSubjectOption;
import org.springblade.modules.exam.excel.ExamSubjectExcel;
import org.springblade.modules.exam.mapper.ExamSubjectChoicesMapper;
import org.springblade.modules.exam.service.ExamSubjectChoicesService;
import org.springblade.modules.exam.service.ExamSubjectOptionService;
@@ -14,6 +15,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.Arrays;
import java.util.Date;
import java.util.List;

@@ -148,4 +150,156 @@
      }
      return status;
   }


   /**
    * 题库导入
    * @param data 导入数据
    * @param isCovered
    */
   @Override
   public void importSubject(List<ExamSubjectExcel> data, Boolean isCovered) {
      data.forEach(examSubjectExcel -> {
         //题目对象
         ExamSubjectChoices subjectChoices = new ExamSubjectChoices();
         subjectChoices.setCreateDate(new Date());
         subjectChoices.setDelFlag(0);
         subjectChoices.setAnswer(examSubjectExcel.getAnswer());
         if (null != examSubjectExcel.getAnalysis() && examSubjectExcel.getAnalysis() != "") {
            subjectChoices.setAnalysis(examSubjectExcel.getAnalysis());
         }
         subjectChoices.setChoicesType(examSubjectExcel.getChoicesType());
         subjectChoices.setSubjectName(examSubjectExcel.getSubjectName());
         subjectChoices.setScore(examSubjectExcel.getScore());
         subjectChoices.setTktype(examSubjectExcel.getTktype());
         //题目新增
         this.save(subjectChoices);


         //判断类型,单选，多选选项新增
         if (examSubjectExcel.getChoicesType() == 0 || examSubjectExcel.getChoicesType() == 1) {
            //A选项新增
            ExamSubjectOption examSubjectOption = new ExamSubjectOption();
            //选项新增
            examSubjectOption.setSubjectChoicesId(subjectChoices.getId());
            examSubjectOption.setCreateDate(new Date());
            examSubjectOption.setDelFlag(0);
            examSubjectOption.setOptionName("A");
            examSubjectOption.setOptionContent(examSubjectExcel.getOptionContentA());
            //新增
            examSubjectOptionService.save(examSubjectOption);

            //B选项新增
            ExamSubjectOption examSubjectOption1 = new ExamSubjectOption();
            //选项新增
            examSubjectOption1.setSubjectChoicesId(subjectChoices.getId());
            examSubjectOption1.setCreateDate(new Date());
            examSubjectOption1.setDelFlag(0);
            examSubjectOption1.setOptionName("B");
            examSubjectOption1.setOptionContent(examSubjectExcel.getOptionContentB());
            //新增
            examSubjectOptionService.save(examSubjectOption1);

            //C选项新增
            ExamSubjectOption examSubjectOption2 = new ExamSubjectOption();
            //选项新增
            examSubjectOption2.setSubjectChoicesId(subjectChoices.getId());
            examSubjectOption2.setCreateDate(new Date());
            examSubjectOption2.setDelFlag(0);
            examSubjectOption2.setOptionName("C");
            examSubjectOption2.setOptionContent(examSubjectExcel.getOptionContentC());
            //新增
            examSubjectOptionService.save(examSubjectOption2);

            //D选项新增
            ExamSubjectOption examSubjectOption3 = new ExamSubjectOption();
            //选项新增
            examSubjectOption3.setSubjectChoicesId(subjectChoices.getId());
            examSubjectOption3.setCreateDate(new Date());
            examSubjectOption3.setDelFlag(0);
            examSubjectOption3.setOptionName("D");
            examSubjectOption3.setOptionContent(examSubjectExcel.getOptionContentD());
            //新增
            examSubjectOptionService.save(examSubjectOption3);
         }


         //多选选项新增
         if (examSubjectExcel.getChoicesType() == 3) {
            //1选项新增
            if (null!=examSubjectExcel.getOptionContentA() && examSubjectExcel.getOptionContentA()!="") {
               ExamSubjectOption examSubjectOption = new ExamSubjectOption();
               //选项新增
               examSubjectOption.setSubjectChoicesId(subjectChoices.getId());
               examSubjectOption.setCreateDate(new Date());
               examSubjectOption.setDelFlag(0);
               examSubjectOption.setOptionName("1");
               examSubjectOption.setOptionContent(examSubjectExcel.getOptionContentA());
               //新增
               examSubjectOptionService.save(examSubjectOption);
            }

            //2选项新增
            if (null!=examSubjectExcel.getOptionContentB() && examSubjectExcel.getOptionContentB()!="") {
               ExamSubjectOption examSubjectOption1 = new ExamSubjectOption();
               //选项新增
               examSubjectOption1.setSubjectChoicesId(subjectChoices.getId());
               examSubjectOption1.setCreateDate(new Date());
               examSubjectOption1.setDelFlag(0);
               examSubjectOption1.setOptionName("2");
               examSubjectOption1.setOptionContent(examSubjectExcel.getOptionContentB());
               //新增
               examSubjectOptionService.save(examSubjectOption1);
            }

            //3选项新增
            if (null!=examSubjectExcel.getOptionContentC() && examSubjectExcel.getOptionContentC()!="") {
               ExamSubjectOption examSubjectOption2 = new ExamSubjectOption();
               //选项新增
               examSubjectOption2.setSubjectChoicesId(subjectChoices.getId());
               examSubjectOption2.setCreateDate(new Date());
               examSubjectOption2.setDelFlag(0);
               examSubjectOption2.setOptionName("3");
               examSubjectOption2.setOptionContent(examSubjectExcel.getOptionContentC());
               //新增
               examSubjectOptionService.save(examSubjectOption2);
            }

            //4选项新增
            if (null!=examSubjectExcel.getOptionContentD() && examSubjectExcel.getOptionContentD()!="") {
               ExamSubjectOption examSubjectOption3 = new ExamSubjectOption();
               //选项新增
               examSubjectOption3.setSubjectChoicesId(subjectChoices.getId());
               examSubjectOption3.setCreateDate(new Date());
               examSubjectOption3.setDelFlag(0);
               examSubjectOption3.setOptionName("4");
               examSubjectOption3.setOptionContent(examSubjectExcel.getOptionContentD());
               //新增
               examSubjectOptionService.save(examSubjectOption3);
            }


            //5选项新增
            if (null!=examSubjectExcel.getOptionContentE() && examSubjectExcel.getOptionContentE()!="") {
               ExamSubjectOption examSubjectOption4 = new ExamSubjectOption();
               //选项新增
               examSubjectOption4.setSubjectChoicesId(subjectChoices.getId());
               examSubjectOption4.setCreateDate(new Date());
               examSubjectOption4.setDelFlag(0);
               examSubjectOption4.setOptionName("5");
               examSubjectOption4.setOptionContent(examSubjectExcel.getOptionContentE());
               //新增
               examSubjectOptionService.save(examSubjectOption4);
            }
         }

         //内网数据同步
         try {
//            arg.test01(arg.url+"/examSubjectChoices/saveSubjectChoicesAndOption",examSubjectChoices);
         } catch (Exception e) {
            e.printStackTrace();
         }
      });

   }
}