Przeglądaj źródła

后台自由组卷,不限制科目

jinxia.mo 1 miesiąc temu
rodzic
commit
ae68cb38e6

+ 2 - 1
ie-admin/src/main/java/com/ruoyi/web/controller/learn/LearnTeacherController.java

@@ -271,7 +271,8 @@ public class LearnTeacherController extends BaseController {
         req.setBuildType("FullIntelligent");
         req.setDirectType(false);
         if(null == req.getSubjectId()) {
-            AjaxResult.error("未选择科目");
+//            AjaxResult.error("未选择科目");
+            req.setSubjectId(11L);
         }
         req.setTeacherId(getTeacherId());
         return AjaxResult.success(learnTeacherService.buildPapersFull(req));

+ 1 - 1
ie-admin/src/main/java/com/ruoyi/web/service/LearnTeacherService.java

@@ -630,7 +630,7 @@ public class LearnTeacherService {
     private LearnTestPaper getPaper(TestPaperVO.TestPaperBuildReq req,DzSubject dzSubject,LearnTest learnTest){
         LearnPaper paper = new LearnPaper();
         paper.setSubjectId(req.getSubjectId());
-        String paperName = StringUtils.isBlank(req.getName()) ? learnTest.getName() + "_" + dzSubject.getSubjectName() : req.getName();
+        String paperName = StringUtils.isBlank(req.getName()) ? learnTest.getName() + "_" + (null==dzSubject?"":dzSubject.getSubjectName()) : req.getName();
         paper.setPaperName(paperName.length() > 254 ? paperName.substring(0, 254) : paperName);
         paper.setYear(Calendar.getInstance().get(Calendar.YEAR)); // TODO  年度
         paper.setPaperType(PaperType.Test.name());