定向取计划年度，但后台没有，待考虑年度问题

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

@@ -256,9 +256,6 @@ public class LearnTeacherController extends BaseController {
         req.setDirectType(true);
         req.setSubjectId(11L);
         req.setTeacherId(getTeacherId());
-        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
-        DzControl control = dzControlService.selectDzControl(sysUser.getLocation(), ExamType.valueOf(req.getExamType()));
-        req.setMatchYear(control.getPlanYear());
         return AjaxResult.success(learnTeacherService.buildPapersDirect(req));
     }
 

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

@@ -14,10 +14,12 @@ import com.ruoyi.common.utils.CommonUtils;
 import com.ruoyi.common.utils.NumberUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.dz.domain.DzClasses;
+import com.ruoyi.dz.domain.DzControl;
 import com.ruoyi.dz.domain.DzSubject;
 import com.ruoyi.dz.domain.DzTeacher;
 import com.ruoyi.dz.mapper.DzClassesMapper;
 import com.ruoyi.dz.mapper.DzTeacherMapper;
+import com.ruoyi.dz.service.IDzControlService;
 import com.ruoyi.dz.service.IDzSubjectService;
 import com.ruoyi.enums.ExamineeStatus;
 import com.ruoyi.enums.PaperStatus;
@@ -66,8 +68,9 @@ public class LearnTeacherService {
     private final LearnAnswerMapper learnAnswerMapper;
     private final DzTeacherMapper dzTeacherMapper;
     private final SysUserMapper sysUserMapper;
+    private final 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) {
+    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) {
         this.dzClassesMapper = dzClassesMapper;
         this.learnKnowledgeTreeMapper = learnKnowledgeTreeMapper;
         this.learnStudentMapper = learnStudentMapper;
@@ -86,6 +89,7 @@ public class LearnTeacherService {
         this.dzTeacherMapper = dzTeacherMapper;
         this.sysUserMapper = sysUserMapper;
         this.learnCultureKnowledgeMapper = learnCultureKnowledgeMapper;
+        this.dzControlService = dzControlService;
         // processDirectStudy();
     }
 
@@ -239,6 +243,16 @@ public class LearnTeacherService {
         if(CollectionUtils.isEmpty(studentList)) {
             throw new ValidationException("无学生可发布");
         }
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        ExamType examType;
+        if(null == req.getExamType()) {
+            examType = null != sysUser.getExamType() ? sysUser.getExamType() : ExamType.OHS;
+        } else {
+            examType = ExamType.valueOf(req.getExamType());
+        }
+        DzControl control = dzControlService.selectDzControl(sysUser.getLocation(), examType);
+        req.setMatchYear(control.getPlanYear());
+
         // 定向手动是精准到一个计划，定向自动是对应一组计划
         Map<Long, Map<String, List<LearnStudent>>> universityDirectStudentMap = studentList.stream()
                 .collect(Collectors.groupingBy(LearnStudent::getUniversityId, Collectors.groupingBy(this::buildDirectKey, Collectors.toList())));