增加定向标识参数

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

@@ -31,6 +31,7 @@ import com.ruoyi.learn.domain.*;
 import com.ruoyi.learn.mapper.*;
 import com.ruoyi.learn.service.ILearnTestService;
 import com.ruoyi.system.mapper.SysUserMapper;
+import com.ruoyi.system.service.ISysConfigService;
 import com.ruoyi.syzy.domain.BBusiWishUniversities;
 import com.ruoyi.syzy.mapper.BBusiWishUniversitiesMapper;
 import com.ruoyi.web.domain.TestRecordCond;
@@ -71,10 +72,11 @@ public class LearnTeacherService {
     private final DzTeacherMapper dzTeacherMapper;
     private final SysUserMapper sysUserMapper;
     private final IDzControlService dzControlService;
+    private final ISysConfigService sysConfigService;
     @Autowired
     private IDzCardsService dzCardsService;
 
-    public LearnTeacherService(DzClassesMapper dzClassesMapper, LearnKnowledgeTreeMapper learnKnowledgeTreeMapper, LearnStudentMapper learnStudentMapper, AMarjorPlanMapper marjorPlanMapper, BBusiWishUniversitiesMapper busiWishUniversitiesMapper, LearnDirectedKnowledgeMapper learnDirectedKnowledgeMapper, PaperService paperService, CommService commService, LearnTestPaperMapper learnTestPaperMapper, LearnQuestionsMapper learnQuestionsMapper, LearnKnowledgeCourseMapper learnKnowledgeCourseMapper, LearnTestStudentMapper learnTestStudentMapper, IDzSubjectService dzSubjectService, ILearnTestService learnTestService, LearnAnswerMapper learnAnswerMapper, DzTeacherMapper dzTeacherMapper, SysUserMapper sysUserMapper, LearnCultureKnowledgeMapper learnCultureKnowledgeMapper, IDzControlService dzControlService) {
+    public LearnTeacherService(DzClassesMapper dzClassesMapper, LearnKnowledgeTreeMapper learnKnowledgeTreeMapper, LearnStudentMapper learnStudentMapper, AMarjorPlanMapper marjorPlanMapper, BBusiWishUniversitiesMapper busiWishUniversitiesMapper, LearnDirectedKnowledgeMapper learnDirectedKnowledgeMapper, PaperService paperService, CommService commService, LearnTestPaperMapper learnTestPaperMapper, LearnQuestionsMapper learnQuestionsMapper, LearnKnowledgeCourseMapper learnKnowledgeCourseMapper, LearnTestStudentMapper learnTestStudentMapper, IDzSubjectService dzSubjectService, ILearnTestService learnTestService, LearnAnswerMapper learnAnswerMapper, DzTeacherMapper dzTeacherMapper, SysUserMapper sysUserMapper, LearnCultureKnowledgeMapper learnCultureKnowledgeMapper, IDzControlService dzControlService, ISysConfigService sysConfigService) {
         this.dzClassesMapper = dzClassesMapper;
         this.learnKnowledgeTreeMapper = learnKnowledgeTreeMapper;
         this.learnStudentMapper = learnStudentMapper;
@@ -94,6 +96,7 @@ public class LearnTeacherService {
         this.sysUserMapper = sysUserMapper;
         this.learnCultureKnowledgeMapper = learnCultureKnowledgeMapper;
         this.dzControlService = dzControlService;
+        this.sysConfigService = sysConfigService;
         // processDirectStudy();
     }
 
@@ -321,7 +324,7 @@ public class LearnTeacherService {
                         paper.setPaperInfo(JSONObject.toJSONString(info));
                         Pair<LearnPaper, List<LearnPaperQuestion>> paperResult = paperService.buildPaper2(null, null, paper, paperDef);
                         paperService.savePaper(paperResult.getKey(), paperResult.getValue());
-                    } else if(!"技能展示/实践操作".equals(directedKnowledge.getModules())) {
+                    } else if(!sysConfigService.selectSkillTestOnly(directedKnowledge.getModules())) {
                         throw new ValidationException("未配置定向题型" + directedKnowledge.getId());
                     } else {
                         noPaper = true;
@@ -369,7 +372,7 @@ public class LearnTeacherService {
                 lts.setBuildType(req.getBuildType());
                 lts.setSubjectId(req.getSubjectId());
                 lts.setDirectKey(directedKey);
-                if(noPaper || "技能展示/实践操作".equals(student.getModules())) {
+                if(noPaper || sysConfigService.selectSkillTestOnly(student.getModules())) {
                     lts.setStatus(ExamineeStatus.Commit.getVal());
                 } else {
                     lts.setPaperId(learnTestPaper.getPaperId());
@@ -540,8 +543,7 @@ public class LearnTeacherService {
         } else {
             learnStudentMapper.updateLearnStudent(upStudent);
         }
-        Set<String> moduleSet = Sets.newHashSet(StringUtils.trimToEmpty(modules).split(","));
-        return moduleSet.size() == 1 && moduleSet.contains("技能展示/实践操作") ? "该专业只考技能展示/实践操作" : "";
+        return sysConfigService.selectSkillTestOnly(modules) ? "该专业只考" + modules : "";
     }
     public List<LearnCultureKnowledge> getLearnCultureKnowledgeList(Long planId) {
         AMarjorPlan plan = marjorPlanMapper.selectAMarjorPlanById(planId);

ie-system/src/main/java/com/ruoyi/system/service/ISysConfigService.java

@@ -33,6 +33,13 @@ public interface ISysConfigService
      */
     public boolean selectCaptchaEnabled();
 
+    /**
+     * 验证moduels是否仅 技能展示/实践操作
+     * @param modules
+     * @return
+     */
+    public boolean selectSkillTestOnly(String modules);
+
     /**
      * 获取短信图形码开关
      *

ie-system/src/main/java/com/ruoyi/system/service/impl/SysConfigServiceImpl.java

@@ -107,6 +107,16 @@ public class SysConfigServiceImpl implements ISysConfigService
         return Convert.toBool(captchaEnabled);
     }
 
+    @Override
+    public boolean selectSkillTestOnly(String modules) {
+        String skills = selectConfigByKey("learn.directed.skills");
+        if (StringUtils.isBlank(skills) || StringUtils.isBlank(modules))
+        {
+            return false;
+        }
+        return skills.contains(modules);
+    }
+
     @Override
     public boolean isSmsCaptchaEnabled()
     {